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

[hthomann]

Author: hthomann
Date: Fri Nov 30 03:09:12 2012
New Revision: 1415484

URL: http://svn.apache.org/viewvc?rev=1415484&view=rev
Log:
OPENJPA-2298: Applied Kevin's changes to trunk.

Modified:
    openjpa/trunk/   (props changed)
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java

Propchange: openjpa/trunk/
------------------------------------------------------------------------------
  Merged /openjpa/branches/2.2.1.x:r1415367
  Merged /openjpa/branches/2.2.x:r1415459

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java?rev=1415484&r1=1415483&r2=1415484&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
 Fri Nov 30 03:09:12 2012
@@ -1263,7 +1263,6 @@ public class PCEnhancer { 
         // if the type is abstract, throw a UserException
         if (_pc.isAbstract()) {
             throwException(code, USEREXCEP);
-            code.vreturn();
 
             code.calculateMaxStack();
             code.calculateMaxLocals();
@@ -1968,7 +1967,6 @@ public class PCEnhancer { 
         // single field identity always throws exception
         if (_meta.isOpenJPAIdentity()) {
             throwException(code, INTERNEXCEP);
-            code.vreturn();
 
             code.calculateMaxStack();
             code.calculateMaxLocals();
@@ -2728,7 +2726,6 @@ public class PCEnhancer { 
             code.invokespecial().setMethod(IllegalArgumentException.class,
                 "<init>", void.class, new Class[]{ String.class });
             code.athrow();
-            code.vreturn();
 
             code.calculateMaxStack();
             code.calculateMaxLocals();