sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1651075 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Date Mon, 12 Jan 2015 12:55:06 GMT
Author: cziegeler
Date: Mon Jan 12 12:55:05 2015
New Revision: 1651075

URL: http://svn.apache.org/r1651075
Log:
SLING-4295 : Potential NPE when resource are updated

Modified:
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java

Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1651075&r1=1651074&r2=1651075&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
(original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Mon Jan 12 12:55:05 2015
@@ -1191,7 +1191,9 @@ implements OsgiInstaller, ResourceChange
                     }
                 }
                 if ( compactAndSave ) {
-                    erl.compact();
+                    if ( erl != null ) {
+                        erl.compact();
+                    }
                     this.persistentList.save();
                 }
             }



Mime
View raw message