tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: NPE protection
Date Thu, 12 Nov 2015 02:00:19 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 5f26017a9 -> fc99d9445


NPE protection


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fc99d944
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fc99d944
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fc99d944

Branch: refs/heads/master
Commit: fc99d9445e21fe009cd849d9d60b39e40d772649
Parents: 5f26017
Author: Romain Manni-Bucau <rmannibu@gmail.com>
Authored: Wed Nov 11 18:00:15 2015 -0800
Committer: Romain Manni-Bucau <rmannibu@gmail.com>
Committed: Wed Nov 11 18:00:15 2015 -0800

----------------------------------------------------------------------
 .../java/org/apache/openejb/testing/ApplicationComposers.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/fc99d944/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index bf65928..4b83058 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -1059,7 +1059,9 @@ public class ApplicationComposers {
             if (originalLoader != null) {
                 Thread.currentThread().setContextClassLoader(originalLoader);
             }
-            System.setProperties(originalProperties);
+            if (originalProperties != null) {
+                System.setProperties(originalProperties);
+            }
         }
     }
 


Mime
View raw message