[dna-commits] DNA SVN: r1404 - trunk/dna-graph/src/main/java/org/jboss/dna/graph/request.

[dna-commits at lists.jboss.org]

Author: bcarothers
Date: 2009-12-04 15:33:42 -0500 (Fri, 04 Dec 2009)
New Revision: 1404

Modified:
   trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CompositeRequest.java
   trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java
Log:
DNA-574

Applied patch that makes SetPropertyRequest.toString null-safe and adds a better toString method for CompositeRequest.

Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CompositeRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CompositeRequest.java	2009-12-04 20:31:02 UTC (rev 1403)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/CompositeRequest.java	2009-12-04 20:33:42 UTC (rev 1404)
@@ -327,4 +327,17 @@
         return false;
     }
 
+    @Override
+    public String toString() {
+        StringBuffer buff = new StringBuffer();
+        buff.append("[CompositeRequest (" + size() + ")");
+
+        for (Request r : this.getRequests()) {
+            buff.append("\n\t").append(r);
+        }
+
+        buff.append("]");
+        return buff.toString();
+    }
+
 }

Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java	2009-12-04 20:31:02 UTC (rev 1403)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/SetPropertyRequest.java	2009-12-04 20:33:42 UTC (rev 1404)
@@ -229,7 +229,8 @@
      */
     @Override
     public String toString() {
+        Object[] values = property().getValuesAsArray();
         return "set property " + property().getName() + " on " + on() + " in the \"" + workspaceName + "\" workspace to "
-               + Arrays.asList(property().getValuesAsArray()).toString();
+               + (values == null ? "null" : Arrays.asList(values).toString());
     }
 }