From ef2065122aec54bdee276b4e7f3777c94748826e Mon Sep 17 00:00:00 2001
From: Jody Grassel <jgrassel@apache.org>
Date: Mon, 10 Sep 2012 20:27:56 +0000
Subject: [PATCH] OPENJPA-2260: Parenthesis-augmented parameters are improperly
 processed at EM level

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1383100 13f79535-47bb-0310-9956-ffa450edef68
---
 .../TestEntityManagerConfiguration.java       | 79 +++++++++++++++++++
 .../persistence/EntityManagerImpl.java        |  7 +-
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java

diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
new file mode 100644
index 000000000..da6a82a44
--- /dev/null
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.openjpa.persistence.entitymanager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+
+import org.apache.openjpa.persistence.EntityManagerImpl;
+import org.apache.openjpa.persistence.datacache.common.apps.PObject;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestEntityManagerConfiguration extends SingleEMFTestCase {
+    public void setUp() throws Exception {
+        super.setUp(PObject.class);
+    }
+    
+    public void testEMConfig001() {
+        Map propMap = new HashMap();
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertTrue(eml.getQuerySQLCache());
+    }
+    
+    public void testEMConfig002() {
+        Map propMap = new HashMap();
+        propMap.put("openjpa.jdbc.QuerySQLCache", "true(EnableStatistics=true)");
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertTrue(eml.getQuerySQLCache());
+    }
+    
+    public void testEMConfig003() {
+        Map propMap = new HashMap();
+        propMap.put("openjpa.jdbc.QuerySQLCache", "false");
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertFalse(eml.getQuerySQLCache());
+    }
+    
+    public void testEMConfig004() {
+        Map propMap = new HashMap();
+        propMap.put("openjpa.jdbc.QuerySQLCache", "false(EnableStatistics=true)");
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertFalse(eml.getQuerySQLCache());
+    }
+    
+    public void testEMConfig005() {
+        Map propMap = new HashMap();
+        propMap.put("openjpa.jdbc.QuerySQLCache", "notabool");
+        EntityManager em = emf.createEntityManager(propMap);
+        
+        EntityManagerImpl eml = (EntityManagerImpl) em;
+        assertFalse(eml.getQuerySQLCache());
+    }
+}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
index 476a48aa6..48c4fe53d 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
@@ -1854,7 +1854,12 @@ public class EntityManagerImpl
             if ("null".equals(value)) {
                 return null;
             } else {
-                return Strings.parse((String) value, targetType);
+                String val = (String) value;
+                int parenIndex = val.indexOf('(');
+                if (!String.class.equals(targetType) && (parenIndex > 0)) {
+                    val = val.substring(0, parenIndex);
+                }
+                return Strings.parse(val, targetType);
             } 
         } else if (value instanceof AutoDetachType) {
         	EnumSet<AutoDetachType> autoDetachFlags = EnumSet.noneOf(AutoDetachType.class);