geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r483136 - /geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java
Date Wed, 06 Dec 2006 16:30:35 GMT
Author: prasad
Date: Wed Dec  6 08:30:34 2006
New Revision: 483136

URL: http://svn.apache.org/viewvc?view=rev&rev=483136
Log:
* check if server is null

Modified:
    geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java

Modified: geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java?view=diff&rev=483136&r1=483135&r2=483136
==============================================================================
--- geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java
(original)
+++ geronimo/server/trunk/maven-plugins/testsuite-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/testsuite/ResultsSummaryMojo.java
Wed Dec  6 08:30:34 2006
@@ -154,7 +154,7 @@
 
     private final String resultsFileName = "ResultsSummary.html";
 
-    private Server server;
+    private Server server = null;
 
     private Scp scp;
 
@@ -185,7 +185,7 @@
        if (keyFile != null) {
            return keyFile;
        }
-       else if (server.getPrivateKey() != null) {
+       else if (server != null && server.getPrivateKey() != null) {
            return server.getPrivateKey();
        }
 
@@ -196,7 +196,7 @@
        if (username != null) {
            return username;
        }
-       else if (server.getUsername() != null) {
+       else if (server != null && server.getUsername() != null) {
            return server.getUsername();
        }
 
@@ -207,7 +207,7 @@
         if (password != null) {
             return password;
         }
-        else if (server.getPassword() != null) {
+        else if (server != null && server.getPassword() != null) {
             return server.getPassword();
         }
 
@@ -218,7 +218,7 @@
         if (passphrase != null) {
             return passphrase;
         }
-        else if (server.getPassphrase() != null) {
+        else if (server != null && server.getPassphrase() != null) {
             return server.getPassphrase();
         }
 



Mime
View raw message