You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/01/12 13:55:06 UTC
svn commit: r1651075 -
/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
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();
}
}