From cd0e909732170fbd952d3eaaff633c385f127f38 Mon Sep 17 00:00:00 2001 From: Heath Thomann Date: Mon, 10 Dec 2012 20:31:59 +0000 Subject: [PATCH] OPENJPA-2284: Save NPE while parsing cascade - back ported to 2.1.x Pinaki's commit to trunk. git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.1.x@1419734 13f79535-47bb-0310-9956-ffa450edef68 --- .../openjpa/persistence/XMLPersistenceMetaDataParser.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java index c331a3483..c17be50f2 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java @@ -1230,10 +1230,8 @@ public class XMLPersistenceMetaDataParser return; ValueMetaData vmd = fmd; - switch (_strategy) { - case ONE_MANY: - case MANY_MANY: - vmd = fmd.getElement(); + if (_strategy == ONE_MANY || _strategy == MANY_MANY) { + vmd = fmd.getElement(); } for (CascadeType cascade : cascades) { switch (cascade) {