[jbpm-commits] JBoss JBPM SVN: r3103 - projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/runtime.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-11-26 09:10:44 -0500 (Wed, 26 Nov 2008)
New Revision: 3103

Modified:
   projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/runtime/Attachments.java
Log:
Fix Key.valueOf()

Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/runtime/Attachments.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/runtime/Attachments.java	2008-11-26 14:07:55 UTC (rev 3102)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/runtime/Attachments.java	2008-11-26 14:10:44 UTC (rev 3103)
@@ -85,16 +85,21 @@
       int index = key.indexOf(",");
       if (key.startsWith("[") && key.endsWith("]") && index > 0)
       {
-        String classPart = key.substring(1, index);
+        Class<?> classPart = null;
+        String className = key.substring(1, index);
         String namePart = key.substring(index + 1, key.length() - 1);
-        try
+        if (className.length() > 0 && !className.equals("null"))
         {
-          return new Key(Class.forName(classPart), namePart);
+          try
+          {
+              classPart = Class.forName(className);
+          }
+          catch (ClassNotFoundException ex)
+          {
+            throw new IllegalArgumentException("Cannot find class '" + className + "' in: " + key);
+          }
         }
-        catch (ClassNotFoundException ex)
-        {
-          throw new IllegalArgumentException("Cannot find class: " + classPart);
-        }
+        return new Key(classPart, namePart);
       }
       return null;
     }