* Check if changeSet is null in commitCompilation() to avoid NullPointerException.
Fixed bug http://helma.org/bugs/show_bug.cgi?id=466
This commit is contained in:
parent
e9e11ddb9a
commit
f03f405f04
1 changed files with 31 additions and 28 deletions
|
@ -889,6 +889,8 @@ public final class RhinoCore implements ScopeProvider {
|
||||||
|
|
||||||
recorder.stopRecording();
|
recorder.stopRecording();
|
||||||
Set changedProperties = recorder.getChangeSet();
|
Set changedProperties = recorder.getChangeSet();
|
||||||
|
|
||||||
|
if (changedProperties != null) {
|
||||||
recorder.clearChangeSet();
|
recorder.clearChangeSet();
|
||||||
|
|
||||||
// ignore all properties that were defined before we started
|
// ignore all properties that were defined before we started
|
||||||
|
@ -924,6 +926,7 @@ public final class RhinoCore implements ScopeProvider {
|
||||||
// update compiled properties
|
// update compiled properties
|
||||||
compiledProperties = changedProperties;
|
compiledProperties = changedProperties;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// mark this type as updated again so it reflects
|
// mark this type as updated again so it reflects
|
||||||
// resources added during compilation
|
// resources added during compilation
|
||||||
|
|
Loading…
Add table
Reference in a new issue