You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/16 12:18:07 UTC
svn commit: r604607 - in /cayenne/main/branches/STABLE-1.2/cayenne:
cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/SimpleNode.java
cayenne-other/release-notes/RELEASE-NOTES-1.2.5.txt
Author: aadamchik
Date: Sun Dec 16 03:18:04 2007
New Revision: 604607
URL: http://svn.apache.org/viewvc?rev=604607&view=rev
Log:
CAY-941 NPE in SimpleNode.connectChildren()
Modified:
cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/SimpleNode.java
cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.5.txt
Modified: cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/SimpleNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/SimpleNode.java?rev=604607&r1=604606&r2=604607&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/SimpleNode.java (original)
+++ cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/SimpleNode.java Sun Dec 16 03:18:04 2007
@@ -241,7 +241,9 @@
protected void connectChildren() {
if (children != null) {
for (int i = 0; i < children.length; i++) {
- children[i].jjtSetParent(this);
+ if (children[i] != null) {
+ children[i].jjtSetParent(this);
+ }
}
}
}
Modified: cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.5.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.5.txt?rev=604607&r1=604606&r2=604607&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.5.txt (original)
+++ cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.5.txt Sun Dec 16 03:18:04 2007
@@ -13,3 +13,5 @@
CAY-263 cdbgen (DbGeneratorTask) must support classpath and classpathref
Bug Fixes:
+
+CAY-941 NPE in SimpleNode.connectChildren()