You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/02/14 23:22:52 UTC

svn commit: r1446370 - /cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java

Author: dkulp
Date: Thu Feb 14 22:22:52 2013
New Revision: 1446370

URL: http://svn.apache.org/r1446370
Log:
Merged revisions 1446367 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1446367 | dkulp | 2013-02-14 17:21:08 -0500 (Thu, 14 Feb 2013) | 18 lines

  Merged revisions 1446359 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1446359 | dkulp | 2013-02-14 17:10:56 -0500 (Thu, 14 Feb 2013) | 10 lines

    Merged revisions 1446358 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1446358 | dkulp | 2013-02-14 17:09:13 -0500 (Thu, 14 Feb 2013) | 2 lines

      [CXF-4820] Add a better exception instead of an NPE

    ........

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java

Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=1446370&r1=1446369&r2=1446370&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java Thu Feb 14 22:22:52 2013
@@ -126,8 +126,12 @@ public class JavaScriptContainer extends
 
             } else {
                 // TODO: wsdl2.0 support
+                throw new ToolException("Only WSDL 1.1 supported");
             }
         }
+        if (serviceList.isEmpty()) {
+            throw new ToolException("Did not find any services in WSDL");
+        }
         Map<String, InterfaceInfo> interfaces = new LinkedHashMap<String, InterfaceInfo>();
         
         ServiceInfo service0 = serviceList.get(0);