cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1403661 - in /cxf/trunk: maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/ testutils/src/main/java/org/apache/cxf/testutil/common/
Date Tue, 30 Oct 2012 11:00:53 GMT
Author: coheigea
Date: Tue Oct 30 11:00:53 2012
New Revision: 1403661

URL: http://svn.apache.org/viewvc?rev=1403661&view=rev
Log:
More minor stuff

Modified:
    cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java

Modified: cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java?rev=1403661&r1=1403660&r2=1403661&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
(original)
+++ cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
Tue Oct 30 11:00:53 2012
@@ -71,12 +71,17 @@ public class WSDLToIDLPlugin extends Abs
     boolean useCompileClasspath;
 
     public void execute() throws MojoExecutionException {
-        outputDir.mkdirs();
-        
+        if (outputDir == null) {
+            throw new MojoExecutionException("The outputDir must be specified");
+        }
+        if (project == null) {
+            throw new MojoExecutionException("The project must be specified");
+        }
         if (wsdltoidlOptions == null) {
             throw new MojoExecutionException("Please specify the wsdltoidl options");
         }
 
+        outputDir.mkdirs();
         
         List<URL> urlList = new ArrayList<URL>();
         StringBuilder buf = new StringBuilder();

Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java?rev=1403661&r1=1403660&r2=1403661&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
(original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
Tue Oct 30 11:00:53 2012
@@ -82,7 +82,7 @@ public final class URISupport {
 
             if (host != null && host.length() != 0) {
                 sb.append(host);
-            } else {
+            } else if (components != null) {
                 sb.append('(');
                 for (int i = 0; i < components.length; i++) {
                     if (i != 0) {

Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=1403661&r1=1403660&r2=1403661&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Tue
Oct 30 11:00:53 2012
@@ -93,9 +93,9 @@ public class ServerLauncher {
 
     private boolean waitForServerToStop() {
         synchronized (mutex) {
+            TimeoutCounter tc = new TimeoutCounter(DEFAULT_TIMEOUT);
             while (!serverIsStopped) {
                 try {
-                    TimeoutCounter tc = new TimeoutCounter(DEFAULT_TIMEOUT);
                     mutex.wait(1000);
                     if (tc.isTimeoutExpired()) {
                         System.out.println("destroying server process");
@@ -108,7 +108,7 @@ public class ServerLauncher {
             }
             if (!inProcess) {
                 //wait for process to end...
-                TimeoutCounter tc = new TimeoutCounter(DEFAULT_TIMEOUT);
+                tc = new TimeoutCounter(DEFAULT_TIMEOUT);
                 while (!tc.isTimeoutExpired()) {
                     try {
                         process.exitValue();
@@ -230,8 +230,8 @@ public class ServerLauncher {
             OutputMonitorThread out = launchOutputMonitorThread(process.getInputStream(),
System.out);
     
             synchronized (mutex) {
+                TimeoutCounter tc = new TimeoutCounter(DEFAULT_TIMEOUT);
                 do {
-                    TimeoutCounter tc = new TimeoutCounter(DEFAULT_TIMEOUT);
                     try {
                         mutex.wait(1000);
                         if (tc.isTimeoutExpired()) {



Mime
View raw message