svn commit: r1186504 - in /incubator/ambari/trunk: CHANGES.txt client/src/main/java/org/apache/ambari/client/BlueprintAdd.java

[vg...@apache.org]

Author: vgogate
Date: Wed Oct 19 21:33:25 2011
New Revision: 1186504

URL: http://svn.apache.org/viewvc?rev=1186504&view=rev
Log:
AMBARI-87

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/client/src/main/java/org/apache/ambari/client/BlueprintAdd.java

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1186504&r1=1186503&r2=1186504&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Oct 19 21:33:25 2011
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.1.0 - unreleased
 
+  AMBARI-87. Importing pre-existing blueprint to Ambari through CLI "blueprint add" gives wrong error message (vgogate)
+
   AMBARI-86. Validate blueprint referenced by cluster exist including it's parent blueprints (vgogate)
 
   AMBARI-85. Adds handling of new states to do with preinstall actions (ddas)

Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/client/BlueprintAdd.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/client/BlueprintAdd.java?rev=1186504&r1=1186503&r2=1186504&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/client/BlueprintAdd.java (original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/client/BlueprintAdd.java Wed Oct 19 21:33:25 2011
@@ -151,11 +151,13 @@ public class BlueprintAdd extends Comman
                     .accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_XML).post(ClientResponse.class, bp);
         }     
         
-        Blueprint bp_return = response.getEntity(Blueprint.class);
         if (response.getStatus() != 200) { 
             System.err.println("Blueprint add command failed. Reason [Code: <"+response.getStatus()+">, Message: <"+response.getHeaders().getFirst("ErrorMessage")+">]");
             System.exit(-1);
         }
+        
+        Blueprint bp_return = response.getEntity(Blueprint.class);
+        
         System.out.println("Blueprint added.\n");
         printBlueprint(bp_return, null);
     }