You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/06/16 23:03:02 UTC

svn commit: r955382 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java

Author: dwoods
Date: Wed Jun 16 21:03:02 2010
New Revision: 955382

URL: http://svn.apache.org/viewvc?rev=955382&view=rev
Log:
OPENJPA-1700 FindBugs - Possible null pointer dereference; Could be caused by using bitwise instead of logical AND.  This could also have lead to unexpected code behavior.

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java?rev=955382&r1=955381&r2=955382&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java Wed Jun 16 21:03:02 2010
@@ -826,7 +826,7 @@ public class ForeignKey
                     Column[] locCols = fks[i].getColumns();
                     Column[] pkCols = fks[i].getPrimaryKeyColumns();
                     // Column counts must match
-                    if (locCols != null && pkCols != null & 
+                    if (locCols != null && pkCols != null &&
                         locCols.length != pkCols.length) {
                         Log log = dbdict.getLog();
                         if (log.isTraceEnabled()) {