continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1367864 - /continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java
Date Wed, 01 Aug 2012 05:51:22 GMT
Author: brett
Date: Wed Aug  1 05:51:21 2012
New Revision: 1367864

URL: http://svn.apache.org/viewvc?rev=1367864&view=rev
Log:
improve logging when shared secret is wrong

Modified:
    continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java

Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java?rev=1367864&r1=1367863&r2=1367864&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java
(original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportAuthenticator.java
Wed Aug  1 05:51:21 2012
@@ -43,10 +43,14 @@ public class SlaveBuildAgentTransportAut
         {
             XmlRpcHttpRequestConfigImpl config = (XmlRpcHttpRequestConfigImpl) pRequest.getConfig();
 
-            if ( StringUtils.isBlank( config.getBasicPassword() ) || 
-                            StringUtils.isBlank( buildAgentConfigurationService.getSharedSecretPassword()
) )
+            if ( config.getBasicPassword() == null || StringUtils.isBlank( config.getBasicPassword()
) )
             {
-                throw new XmlRpcException( "Shared Secret Password is not configured properly"
);
+                throw new XmlRpcException( "Shared Secret Password is not present in the
server request" );
+            }
+
+            if ( buildAgentConfigurationService.getSharedSecretPassword() == null || StringUtils.isBlank(
buildAgentConfigurationService.getSharedSecretPassword() ) )
+            {
+                throw new XmlRpcException( "Shared Secret Password is not configured properly
on the build agent" );
             }
 
             return buildAgentConfigurationService.getSharedSecretPassword().equals( config.getBasicPassword()
);



Mime
View raw message