Author: dkulp
Date: Fri Jun 18 17:50:27 2010
New Revision: 956068
URL: http://svn.apache.org/viewvc?rev=956068&view=rev
Log:
Merged revisions 956066 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r956066 | dkulp | 2010-06-18 13:46:53 -0400 (Fri, 18 Jun 2010) | 1 line
Helios eclipse compiler finds some dead code
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=956068&r1=956067&r2=956068&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++
cxf/branches/2.2.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Fri Jun 18 17:50:27 2010
@@ -296,7 +296,6 @@ public class WSDLToJavaContainer extends
}
}
String serviceName =
(String)context.get(ToolConstants.CFG_SERVICENAME);
- QName qname = null;
for (Definition definition : defs) {
if (serviceName != null) {
for (Iterator<QName> ite =
definition.getServices().keySet().iterator(); ite.hasNext();) {
@@ -308,12 +307,8 @@ public class WSDLToJavaContainer extends
}
}
- if (qname == null) {
- Message msg = new Message("SERVICE_NOT_FOUND", LOG, new Object[]
{serviceName});
- throw new ToolException(msg);
- }
-
- return qname;
+ Message msg = new Message("SERVICE_NOT_FOUND", LOG, new Object[]
{serviceName});
+ throw new ToolException(msg);
}
public void loadDefaultNSPackageMapping(ToolContext env) {
