[jbpm-commits] JBoss JBPM SVN: r6262 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm: db/hibernate and 1 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-04-16 21:58:58 -0400 (Fri, 16 Apr 2010)
New Revision: 6262

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/def/Access.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/AccessType.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
Log:
substitute a space for the empty string prior to assigning field Access.access because oracle treats the empty string as null

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/def/Access.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/def/Access.java	2010-04-17 00:11:15 UTC (rev 6261)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/def/Access.java	2010-04-17 01:58:58 UTC (rev 6262)
@@ -34,7 +34,13 @@
 
   public Access(String access) {
     if (access != null) {
-      this.access = access.toLowerCase();
+      if (access.length() > 0) {
+        this.access = access.toLowerCase();
+      }
+      else {
+        // oracle treats an empty string as null; store a space instead
+        this.access = " ";
+      }
     }
   }
 
@@ -58,8 +64,7 @@
    * verifies if the given accessLiteral is included in the access text.
    */
   public boolean hasAccess(String accessLiteral) {
-    if (access == null) return false;
-    return (access.indexOf(accessLiteral.toLowerCase()) != -1);
+    return access == null ? false : access.indexOf(accessLiteral.toLowerCase()) != -1;
   }
 
   public String toString() {

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/AccessType.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/AccessType.java	2010-04-17 00:11:15 UTC (rev 6261)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/AccessType.java	2010-04-17 01:58:58 UTC (rev 6262)
@@ -64,7 +64,7 @@
   }
 
   public String toString(Object value) {
-    return (value!=null? value.toString() : "null");
+    return value != null ? value.toString() : "null";
   }
 
   public Object fromStringValue(String xml) {

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java	2010-04-17 00:11:15 UTC (rev 6261)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java	2010-04-17 01:58:58 UTC (rev 6262)
@@ -166,7 +166,6 @@
     catch (DocumentException e) {
       throw new JpdlException("failed to parse process document", e);
     }
-
     return processDefinition;
   }
 
@@ -426,7 +425,6 @@
       Delegation taskControllerDelegation = new Delegation();
       taskControllerDelegation.read(taskControllerElement, this);
       taskController.setTaskControllerDelegation(taskControllerDelegation);
-
     }
     else {
       List variableAccesses = readVariableAccesses(taskControllerElement);