svn commit: r1243113 - /incubator/wave/trunk/src/org/waveprotocol/box/server/robots/RobotRegistrationServlet.java

[yurize]

Author: yurize
Date: Sat Feb 11 17:48:57 2012
New Revision: 1243113

URL: http://svn.apache.org/viewvc?rev=1243113&view=rev
Log:
Fixes NPE in Robot registration. By Vicente J. Ruiz Jurado 
https://reviews.apache.org/r/3868/

Modified:
    
incubator/wave/trunk/src/org/waveprotocol/box/server/robots/RobotRegistrationServlet.java

Modified: 
incubator/wave/trunk/src/org/waveprotocol/box/server/robots/RobotRegistrationServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/server/robots/RobotRegistrationServlet.java?rev=1243113&r1=1243112&r2=1243113&view=diff
==============================================================================
--- 
incubator/wave/trunk/src/org/waveprotocol/box/server/robots/RobotRegistrationServlet.java
 (original)
+++ 
incubator/wave/trunk/src/org/waveprotocol/box/server/robots/RobotRegistrationServlet.java
 Sat Feb 11 17:48:57 2012
@@ -119,7 +119,8 @@ public class RobotRegistrationServlet ex
     try{
       robotAccount = robotRegistrar.registerNew(id, location);
     } catch (RobotRegistrationException e) {
-      doRegisterGet(req, resp, e.getLocalizedMessage());
+      doRegisterGet(req, resp, e.getMessage());
+      return;
     } catch (PersistenceException e) {
       LOG.severe("Failed to retrieve account data for " + id, e);
       doRegisterGet(req, resp, "Failed to retrieve account data for " + 
id.getAddress());