incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r769024 - /incubator/sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ScalaScriptEngineFactory.java
Date Mon, 27 Apr 2009 15:17:07 GMT
Author: bdelacretaz
Date: Mon Apr 27 15:17:06 2009
New Revision: 769024

URL: http://svn.apache.org/viewvc?rev=769024&view=rev
Log:
SLING-928 - some bootUrls are null when running cargo integration tests

Modified:
    incubator/sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ScalaScriptEngineFactory.java

Modified: incubator/sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ScalaScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ScalaScriptEngineFactory.java?rev=769024&r1=769023&r2=769024&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ScalaScriptEngineFactory.java
(original)
+++ incubator/sling/trunk/contrib/scripting/scala/engine/src/main/java/org/apache/sling/scripting/scala/engine/ScalaScriptEngineFactory.java
Mon Apr 27 15:17:06 2009
@@ -144,7 +144,11 @@
         URL[] bootUrls = getBootUrls(bundles[0]);
         StringBuilder bootPath = new StringBuilder(settings.classpath().v());
         for (int k = 0; k < bootUrls.length; k++) {
-            bootPath.append(PATH_SEPARATOR).append(bootUrls[k].getPath());
+            // bootUrls are sometimes null, at least when running integration
+            // tests with cargo-maven2-plugin
+            if(bootUrls[k] != null) {
+                bootPath.append(PATH_SEPARATOR).append(bootUrls[k].getPath());
+            }
         }
 
         settings.classpath().v_$eq(bootPath.toString());



Mime
View raw message