Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-02-23 02:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2472: Fix concurrency bug in ClassMetaData. Patch contributed by Dalia Abo Sheasha.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1564989 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Richard G. Curtis 2014-02-05 23:12:37 +00:00
parent e21bcdfaa9
commit 731649a2c9
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
View File

@ -2692,19 +2692,20 @@ public class ClassMetaData
// Default to false, set to true only if this type is abstract and // Default to false, set to true only if this type is abstract and
// declares a PKField. // declares a PKField.
_hasAbstractPKField = Boolean.FALSE; Boolean temp = Boolean.FALSE;
if (isAbstract() == true) { if (isAbstract() == true) {
FieldMetaData[] declaredFields = getDeclaredFields(); FieldMetaData[] declaredFields = getDeclaredFields();
if (declaredFields != null && declaredFields.length != 0) { if (declaredFields != null && declaredFields.length != 0) {
for (FieldMetaData fmd : declaredFields) { for (FieldMetaData fmd : declaredFields) {
if (fmd.isPrimaryKey()) { if (fmd.isPrimaryKey()) {
_hasAbstractPKField = Boolean.TRUE; temp = Boolean.TRUE;
break; break;
} }
} }
} }
} }
_hasAbstractPKField = temp;
return _hasAbstractPKField.booleanValue(); return _hasAbstractPKField.booleanValue();
} }
@ -2726,7 +2727,7 @@ public class ClassMetaData
} }
// Default to FALSE, until proven true. // Default to FALSE, until proven true.
_hasPKFieldsFromAbstractClass = Boolean.FALSE; Boolean temp = Boolean.FALSE;
FieldMetaData[] pkFields = getPrimaryKeyFields(); FieldMetaData[] pkFields = getPrimaryKeyFields();
for (FieldMetaData fmd : pkFields) { for (FieldMetaData fmd : pkFields) {
@ -2741,11 +2742,12 @@ public class ClassMetaData
} }
} }
if (cmd == fmdDMDA) { if (cmd == fmdDMDA) {
_hasPKFieldsFromAbstractClass = Boolean.TRUE; temp = Boolean.TRUE;
break; break;
} }
} }
} }
_hasPKFieldsFromAbstractClass = temp;
return _hasPKFieldsFromAbstractClass.booleanValue(); return _hasPKFieldsFromAbstractClass.booleanValue();
} }
@ -2783,10 +2785,11 @@ public class ClassMetaData
} }
} }
int idsSize = ids.size(); int idsSize = ids.size();
_pkAndNonPersistentManagedFmdIndexes = new int[idsSize]; int[] temp = new int[idsSize];
for(int i = 0; i<idsSize; i++){ for (int i = 0; i < idsSize; i++) {
_pkAndNonPersistentManagedFmdIndexes[i] = ids.get(i).intValue(); temp[i] = ids.get(i).intValue();
} }
_pkAndNonPersistentManagedFmdIndexes = temp;
} }
return _pkAndNonPersistentManagedFmdIndexes; return _pkAndNonPersistentManagedFmdIndexes;
} }