/hg/icedtea7-forest/jdk: 3 new changesets

[andrew at icedtea.classpath.org]

changeset b2198909d6d8 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=b2198909d6d8
author: andrew
date: Thu Apr 17 22:51:43 2014 +0100

	Fix merge duplication in com.sun.script.javascript.RhinoTopLevel


changeset 466edca8234a in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=466edca8234a
author: andrew
date: Tue Jul 15 22:57:57 2014 +0100

	PR1853: Revert PR729 from minor release


changeset 605610f355ce in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=605610f355ce
author: andrew
date: Tue Jul 15 23:03:29 2014 +0100

	PR1864: PCSC + OpenJDK 1.7 crash on Fedora 20


diffstat:

 src/share/classes/com/sun/script/javascript/RhinoTopLevel.java |  1 -
 src/share/classes/javax/swing/UIManager.java                   |  5 ++---
 src/solaris/native/sun/security/smartcardio/pcsc_md.c          |  1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 9ff90d1818b1 -r 605610f355ce src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
--- a/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	Thu Jun 12 21:14:44 2014 +0100
+++ b/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	Tue Jul 15 23:03:29 2014 +0100
@@ -26,7 +26,6 @@
 package com.sun.script.javascript;
 
 import sun.org.mozilla.javascript.internal.*;
-import java.security.AccessControlContext;
 import javax.script.*;
 import java.security.AccessControlContext;
 
diff -r 9ff90d1818b1 -r 605610f355ce src/share/classes/javax/swing/UIManager.java
--- a/src/share/classes/javax/swing/UIManager.java	Thu Jun 12 21:14:44 2014 +0100
+++ b/src/share/classes/javax/swing/UIManager.java	Tue Jul 15 23:03:29 2014 +0100
@@ -606,9 +606,8 @@
         } else {
             String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop"));
             Toolkit toolkit = Toolkit.getDefaultToolkit();
-            boolean gtkDesktop = "gnome".equals(desktop) ||
-              (osType == OSInfo.OSType.LINUX && SwingUtilities2.isLocalDisplay());
-            if (gtkDesktop && toolkit instanceof SunToolkit &&
+            if ("gnome".equals(desktop) &&
+                    toolkit instanceof SunToolkit &&
                     ((SunToolkit) toolkit).isNativeGTKAvailable()) {
                 // May be set on Linux and Solaris boxs.
                 return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
diff -r 9ff90d1818b1 -r 605610f355ce src/solaris/native/sun/security/smartcardio/pcsc_md.c
--- a/src/solaris/native/sun/security/smartcardio/pcsc_md.c	Thu Jun 12 21:14:44 2014 +0100
+++ b/src/solaris/native/sun/security/smartcardio/pcsc_md.c	Tue Jul 15 23:03:29 2014 +0100
@@ -79,7 +79,6 @@
 
 #ifndef USE_SYSTEM_PCSC
 void *findFunction(JNIEnv *env, void *hModule, char *functionName) {
-    return NULL;
     void *fAddress = dlsym(hModule, functionName);
     if (fAddress == NULL) {
         char errorMessage[256];