Author: mduerig
Date: Tue Feb 23 21:50:46 2016
New Revision: 1731970

URL: http://svn.apache.org/viewvc?rev=1731970&view=rev
Log:
OAK-4045: NPE when running oak-run from within the IDE
Null check return value of getResourceAsStream

Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1731970&r1=1731969&r2=1731970&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
 Tue Feb 23 21:50:46 2016
@@ -63,7 +63,11 @@ public final class Main {
         InputStream stream = 
Main.class.getResourceAsStream("/META-INF/maven/org.apache.jackrabbit/oak-run/pom.properties");
 
         try {
-            return getProductVersion(stream);
+            if (stream == null) {
+                return null;
+            } else {
+                return getProductVersion(stream);
+            }
         } finally {
             closeQuietly(stream);
         }


Reply via email to