incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r921448 - /sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/BundleFS.scala
Date Wed, 10 Mar 2010 16:56:57 GMT
Author: cziegeler
Date: Wed Mar 10 16:56:57 2010
New Revision: 921448

URL: http://svn.apache.org/viewvc?rev=921448&view=rev
Log:
SLING-1350 : Many test failures in contrib/launchpad/testing. Applied patch from Michael Dürig
- add missing file

Modified:
    sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/BundleFS.scala

Modified: sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/BundleFS.scala
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/BundleFS.scala?rev=921448&r1=921447&r2=921448&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/BundleFS.scala
(original)
+++ sling/trunk/contrib/scripting/scala/script/src/main/scala/org/apache/sling/scripting/scala/BundleFS.scala
Wed Mar 10 16:56:57 2010
@@ -97,6 +97,7 @@ object BundleFS {
       def elements: Iterator[AbstractFile] = {
         new Iterator[AbstractFile]() {
           val dirs = bundle.getEntryPaths(fullName)
+          
           var nextEntry = prefetch()
           
           def hasNext() = {
@@ -118,7 +119,7 @@ object BundleFS {
           }
           
           private def prefetch() = {
-            if (dirs.hasMoreElements) {
+            if (dirs != null && dirs.hasMoreElements) {
               val entry = dirs.nextElement.asInstanceOf[String]
               var entryUrl = bundle.getResource("/" + entry)
 



Mime
View raw message