You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mp...@apache.org on 2006/09/28 00:50:08 UTC

svn commit: r450619 - /incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java

Author: mprudhom
Date: Wed Sep 27 15:50:08 2006
New Revision: 450619

URL: http://svn.apache.org/viewvc?view=rev&rev=450619
Log:
Null checks.

Modified:
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java?view=diff&rev=450619&r1=450618&r2=450619
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java Wed Sep 27 15:50:08 2006
@@ -363,7 +363,7 @@
         FieldMetaData[] fmds = _meta.getDeclaredFields();
         Method meth;
         BCMethod getter, setter = null;
-        BCField returned, assigned;
+        BCField returned, assigned = null;
         for (int i = 0; i < fmds.length; i++) {
             if (!(fmds[i].getBackingMember() instanceof Method)) {
                 addViolation("property-bad-member",
@@ -408,11 +408,15 @@
                 }
             }
 
-            assigned = getAssignedField(setter);
+            if (setter != null)
+                assigned = getAssignedField(setter);
+
             if (assigned != null) {
                 if (_backingFields == null)
                     _backingFields = new HashMap();
-                _backingFields.put(setter.getName(), assigned.getName());
+
+                if (setter != null)
+                    _backingFields.put(setter.getName(), assigned.getName());
 
                 if (assigned != returned)
                     addViolation("property-setter-getter-mismatch",