Author: ffang Date: Thu May 16 02:51:08 2013 New Revision: 1483160 URL: http://svn.apache.org/r1483160 Log: Merged revisions 1483155 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1483155 | ffang | 2013-05-16 10:33:30 +0800 (四, 16 5 2013) | 16 lines Merged revisions 1483154 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1483154 | ffang | 2013-05-16 10:25:39 +0800 (四, 16 5 2013) | 9 lines Merged revisions 1483151 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1483151 | ffang | 2013-05-16 10:03:10 +0800 (四, 16 5 2013) | 1 line [CXF-5020]add NPE guard when we restore original java.class.path system property ........ ................ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java cxf/branches/2.5.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu May 16 02:51:08 2013 @@ -0,0 +1,3 @@ +/cxf/branches/2.6.x-fixes:1483155 +/cxf/branches/2.7.x-fixes:1483154 +/cxf/trunk:1483151 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java?rev=1483160&r1=1483159&r2=1483160&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java (original) +++ cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java Thu May 16 02:51:08 2013 @@ -119,7 +119,9 @@ public class ClassLoaderSwitcher { */ public void restoreClassLoader() { Thread.currentThread().setContextClassLoader(origContextClassloader); - System.setProperty("java.class.path", origClassPath); + if (origClassPath != null) { + System.setProperty("java.class.path", origClassPath); + } Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties()); for (Object o : newProps.keySet()) { Modified: cxf/branches/2.5.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java?rev=1483160&r1=1483159&r2=1483160&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java (original) +++ cxf/branches/2.5.x-fixes/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java Thu May 16 02:51:08 2013 @@ -165,7 +165,9 @@ public class WSDLToIDLPlugin extends Abs bus.shutdown(true); } Thread.currentThread().setContextClassLoader(origContext); - System.setProperty("java.class.path", cp); + if (cp != null) { + System.setProperty("java.class.path", cp); + } Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties()); for (Object o : newProps.keySet()) { Modified: cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java?rev=1483160&r1=1483159&r2=1483160&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java (original) +++ cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java Thu May 16 02:51:08 2013 @@ -112,7 +112,9 @@ public class ClassLoaderSwitcher { */ public void restoreClassLoader() { Thread.currentThread().setContextClassLoader(origContextClassloader); - System.setProperty("java.class.path", origClassPath); + if (origClassPath != null) { + System.setProperty("java.class.path", origClassPath); + } Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties()); for (Object o : newProps.keySet()) { Modified: cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java?rev=1483160&r1=1483159&r2=1483160&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java (original) +++ cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java Thu May 16 02:51:08 2013 @@ -121,7 +121,9 @@ public class ClassLoaderSwitcher { */ public void restoreClassLoader() { Thread.currentThread().setContextClassLoader(origContextClassloader); - System.setProperty("java.class.path", origClassPath); + if (origClassPath != null) { + System.setProperty("java.class.path", origClassPath); + } Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties()); for (Object o : newProps.keySet()) {
