Mercurial > hg > icedtea8-forest > nashorn

changeset 2420:0d65cee90409 jdk8u192-b05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author aefimov
date Fri, 03 Aug 2018 19:17:48 +0100
parents f5fdcd69628e (current diff) 755288b11f2e (diff)
children 0f388677a674 0db74627bade
files .hgtags
diffstat 2 files changed, 64 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Aug 01 03:37:55 2018 -0700
+++ b/.hgtags	Fri Aug 03 19:17:48 2018 +0100
@@ -864,6 +864,51 @@
 0a93e6a9934e9e81e96b74e11402793026abfe55 jdk8u162-b11
 3f877d379c48178a1203089ea56b4e8061689b5d jdk8u162-b12
 3c567ee8d853375cafa61378ab890bb4e82d98c2 jdk8u162-b31
+59508dc01b26fa97854f4fed3ae466e3e3eb3a3e jdk8u162-b32
+4eff9c0f63f007c22495a4d4ab5c295499554855 jdk8u162-b33
+e6b190611af9e2b56270d45fdabb863ece49b600 jdk8u162-b34
+3702c8d746075071f459a422a9f226f3a5be5c2f jdk8u171-b00
+8281166a86a5ebee40858b6ed2f6068e640b0099 jdk8u171-b01
+710e8cf9b7a554469bbaf78e371eb1f4fe086ce2 jdk8u171-b02
+42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u171-b03
+0f09c1423f3454cac9eef7240d2ff831a104b4d8 jdk8u171-b04
+801694cc35e00907f3ef382ae1495e2dadd22278 jdk8u171-b05
+3ae3ebe2e2ee5648c38862179b2b1d1951ad97d7 jdk8u172-b00
+8b311af3f1b260035ff12e86e324f8254b1d760b jdk8u172-b01
+e5e19194a8a2ce6849791bbc2aea2ac1632cdbc2 jdk8u172-b02
+93b6ac37872647ca64877561035f43473da96c04 jdk8u172-b03
+9bd2bd2edbd7c205deafc89c97cb882bce9f232c jdk8u172-b04
+42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u181-b00
+42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u171-b03
+0f09c1423f3454cac9eef7240d2ff831a104b4d8 jdk8u171-b04
+801694cc35e00907f3ef382ae1495e2dadd22278 jdk8u171-b05
+bb41125356006139d5e56a1c67a55779a42a5a9e jdk8u171-b06
+059028cb56528c8f1673497ad52f847b28eba43a jdk8u171-b07
+fd005fcf00fe65dad4b86508a5cd2ea5c627acd5 jdk8u171-b08
+9d9a43a064fc3db9a65a41accf707fc43605955f jdk8u171-b09
+e9b4feb9ed6ac7d8d620b162f8780f8470b21711 jdk8u171-b10
+921be31addf6c9fda681af76bec704780e5f2084 jdk8u171-b11
+3ae3ebe2e2ee5648c38862179b2b1d1951ad97d7 jdk8u172-b00
+8b311af3f1b260035ff12e86e324f8254b1d760b jdk8u172-b01
+e5e19194a8a2ce6849791bbc2aea2ac1632cdbc2 jdk8u172-b02
+93b6ac37872647ca64877561035f43473da96c04 jdk8u172-b03
+9bd2bd2edbd7c205deafc89c97cb882bce9f232c jdk8u172-b04
+c6d01f70f16682bcfcca4c5a85424a33bed96298 jdk8u172-b05
+bb62c7f3b3edf266edd5d093418958f1dc909ce7 jdk8u172-b06
+b14b138cc741dfb9980896516468a95c8c290cd7 jdk8u172-b07
+32ba142b2880976087c6da77cc32e58a5d0e8798 jdk8u172-b08
+1353afc92267dd05157f752d698fba528924e1a2 jdk8u172-b09
+3087d3a4983a9f280e6b29582486e81f020973f2 jdk8u172-b10
+df6d51bc4491fd9fc6aacdb840d2d4d6a07efb03 jdk8u172-b11
+8daca0fd12400791d3fea02a5e9fc195deee06e2 jdk8u181-b01
+51994ad46b6c3be364677138e4f6e123a6c4e3c3 jdk8u181-b02
+4a9aad281a0ee5b34e9e1be146bfc564eaa0ae03 jdk8u181-b03
+5a0b8cd7f9b5cd6099bf7c0536bd114dd4cbf545 jdk8u191-b00
+c6d01f70f16682bcfcca4c5a85424a33bed96298 jdk8u172-b05
+7ea9b82890105406d1ac7316b28559ccc05768c0 jdk8u162-b35
+7de7950c0351ccd6f82787090b78c16b0384b90c jdk8u162-b36
+4aac2244c3a94ab41a583a7570b195f3f638069c jdk8u162-b37
+4c81e132698244f1b7f93a4d2c3d872dbb24bbc4 jdk8u162-b38
 3702c8d746075071f459a422a9f226f3a5be5c2f jdk8u171-b00
 8281166a86a5ebee40858b6ed2f6068e640b0099 jdk8u171-b01
 710e8cf9b7a554469bbaf78e371eb1f4fe086ce2 jdk8u171-b02
@@ -889,6 +934,13 @@
 1353afc92267dd05157f752d698fba528924e1a2 jdk8u172-b09
 3087d3a4983a9f280e6b29582486e81f020973f2 jdk8u172-b10
 df6d51bc4491fd9fc6aacdb840d2d4d6a07efb03 jdk8u172-b11
+1ade28deec4a0a92e4ee1d743fbd88594d2b033a jdk8u172-b31
+228f8e1dceb069247fad31d08baf61d7a57236a8 jdk8u172-b32
+8c6bd9d0cf71f8014a6c4840a051068660128a3c jdk8u172-b33
+fbb5a1798b866f62862e7b76f340fd9882f325e1 jdk8u172-b34
+7b299af843c764a53e38ffaca7b307cce64ca4e8 jdk8u172-b35
+2a333371ef73230759cd207b3ed544331ed6b7e5 jdk8u172-b36
+28cbe440b3c42aa68cff042394ecf3a805e1b569 jdk8u172-b37
 8daca0fd12400791d3fea02a5e9fc195deee06e2 jdk8u181-b01
 51994ad46b6c3be364677138e4f6e123a6c4e3c3 jdk8u181-b02
 4a9aad281a0ee5b34e9e1be146bfc564eaa0ae03 jdk8u181-b03
@@ -902,6 +954,10 @@
 381f2224e3c3eadc2e3bfaf81d43be2d1f8078b9 jdk8u181-b11
 6372ac5af37ae40a4875c6cdf5c28aeb2a701899 jdk8u181-b12
 3824009355133053ce6c714fff39d2e12dc67cde jdk8u181-b13
+4706dc5f752c0e364413e62f19f905a543d602be jdk8u191-b01
+9bae2c31c00bb6081026f7cb61aa50c726239a7a jdk8u191-b02
+1d23567f6ea387f9e047dd0d81f303b6371a27fb jdk8u191-b03
+c374c805e6fb531f05ffd5070a148633c6f0626a jdk8u191-b04
 5b549167a92971d6793079c702fa2fd79a987cbc jdk8u182-b00
 a57083d7fe9ac674c0841db6849140424bb16eef jdk8u192-b00
 bc4618963547efc17931174f57bea387f89cd5e9 jdk8u192-b01
--- a/src/jdk/nashorn/internal/objects/Global.java	Wed Aug 01 03:37:55 2018 -0700
+++ b/src/jdk/nashorn/internal/objects/Global.java	Fri Aug 03 19:17:48 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1427,13 +1427,14 @@
             }
         }
 
-        switch (nameStr) {
-        case "context":
+        if ("context".equals(nameStr)) {
             return sctxt;
-        case "engine":
-            return global.engine;
-        default:
-            break;
+        } else if ("engine".equals(nameStr)) {
+            // expose "engine" variable only when there is no security manager
+            // or when no class filter is set.
+            if (System.getSecurityManager() == null || global.getClassFilter() == null) {
+                return global.engine;
+            }
         }
 
         if (self == UNDEFINED) {