rineholt 2002/09/25 21:35:05
Modified: java/src/org/apache/axis/description OperationDesc.java
ServiceDesc.java
Log:
By default and if "*" is specified accept all methods found that conform.
Revision Changes Path
1.23 +2 -0 xml-axis/java/src/org/apache/axis/description/OperationDesc.java
Index: OperationDesc.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/description/OperationDesc.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- OperationDesc.java 25 Sep 2002 03:55:16 -0000 1.22
+++ OperationDesc.java 26 Sep 2002 04:35:05 -0000 1.23
@@ -85,6 +85,8 @@
// public Document method(Document)
public static final int MSG_METHOD_DOCUMENT = 4;
+ public static final int MSG_METHOD_NONCONFORMING = -4;
+
protected static Log log =
LogFactory.getLog(OperationDesc.class.getName());
1.62 +6 -2 xml-axis/java/src/org/apache/axis/description/ServiceDesc.java
Index: ServiceDesc.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/ServiceDesc.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ServiceDesc.java 25 Sep 2002 16:54:24 -0000 1.61
+++ ServiceDesc.java 26 Sep 2002 04:35:05 -0000 1.62
@@ -102,6 +102,7 @@
/** The name of this service */
private String name = null;
+ private static final String ALL_METHODS= "*";
/** List of allowed methods */
/** null allows everything, an empty ArrayList allows nothing */
@@ -578,6 +579,7 @@
if (style == Style.MESSAGE) {
int messageOperType = checkMessageMethod(method);
+ if(messageOperType == OperationDesc.MSG_METHOD_NONCONFORMING)
continue;
if (messageOperType == -1) {
throw new InternalException("Couldn't match method to any
of the allowable message-style patterns!");
}
@@ -701,9 +703,10 @@
return OperationDesc.MSG_METHOD_SOAPENVELOPE;
}
}
-
- throw new InternalException (Messages.getMessage("badMsgMethodParams",
+ if( null != allowedMethods && !allowedMethods.isEmpty() )
+ throw new InternalException (Messages.getMessage("badMsgMethodParams",
method.getName()));
+ return OperationDesc.MSG_METHOD_NONCONFORMING;
}
/**
@@ -1020,6 +1023,7 @@
// appropriately.
if (style == Style.MESSAGE) {
int messageOperType = checkMessageMethod(method);
+ if(messageOperType == OperationDesc.MSG_METHOD_NONCONFORMING) return;
if (messageOperType == -1) {
throw new InternalException("Couldn't match method to any of the
allowable message-style patterns!");
}
