You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/08/18 12:47:08 UTC
svn commit: r1696388 -
/jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java
Author: chetanm
Date: Tue Aug 18 10:47:07 2015
New Revision: 1696388
URL: http://svn.apache.org/r1696388
Log:
OAK-3248 - Felix Connect throws exception when launching Oak in Spring Boot env
Only fetch URL if JarEntry is found
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java
Modified: jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java?rev=1696388&r1=1696387&r2=1696388&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java Tue Aug 18 10:47:07 2015
@@ -105,7 +105,9 @@ class SpringBootSupport {
actual invocation has to be done via reflection. URL returned here has proper
Handler configured to allow reverse access via URL connection
*/
- return (URL) getUrlMethod(jarEntry).invoke(jarEntry);
+ if (jarEntry != null) {
+ return (URL) getUrlMethod(jarEntry).invoke(jarEntry);
+ }
} catch (Exception e) {
log.warn("Error occurred while fetching jar entry {} from {}", entryName, jarFile, e);
}