You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/03/19 20:07:46 UTC
svn commit: r520047 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
context/MessageContext.java engine/InstanceDispatcher.java
util/JavaUtils.java
Author: gdaniels
Date: Mon Mar 19 12:07:46 2007
New Revision: 520047
URL: http://svn.apache.org/viewvc?view=rev&rev=520047
Log:
* Deprecate MessageContext.isHeaderPresent(), remove last usage thereof.
* A little code cleanup
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=520047&r1=520046&r2=520047
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Mon Mar 19 12:07:46 2007
@@ -1547,19 +1547,14 @@
* a soap:Header present, use getHeader() and also check for null on getHeader() to be absolutely sure.
*
* @return boolean
+ * @deprecated The bonus you used to get from this is now built in to SOAPEnvelope.getHeader()
*/
public boolean isHeaderPresent() {
// If there's no envelope there can't be a header.
if (this.envelope == null) {
return false;
}
- OMElement node = this.envelope.getFirstElement();
- if (node == null) {
- return false;
- } else if (node.getQName().getLocalPart().equals(SOAPConstants.BODY_LOCAL_NAME)) {
- return false;
- }
- return true;
+ return (this.envelope.getHeader() != null);
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java?view=diff&rev=520047&r1=520046&r2=520047
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java Mon Mar 19 12:07:46 2007
@@ -166,9 +166,6 @@
}
private void extractServiceGroupContextId(MessageContext msgContext) throws AxisFault {
- if (!msgContext.isHeaderPresent()) {
- return;
- }
SOAPHeader soapHeader = msgContext.getEnvelope().getHeader();
if (soapHeader != null) {
OMElement serviceGroupId = soapHeader.getFirstChildWithName(SERVICE_GROUP_QNAME);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java?view=diff&rev=520047&r1=520046&r2=520047
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java Mon Mar 19 12:07:46 2007
@@ -232,7 +232,7 @@
* Follow in 'C' tradition of boolean values:
* false is specific (0), everything else is true;
*/
- public static final boolean isTrue(String value) {
+ public static boolean isTrue(String value) {
return !isFalseExplicitly(value);
}
@@ -240,7 +240,7 @@
* Tests the String 'value':
* return 'true' if its 'true', '1', or 'yes' - else 'false'
*/
- public static final boolean isTrueExplicitly(String value) {
+ public static boolean isTrueExplicitly(String value) {
return value != null &&
(value.equalsIgnoreCase("true") ||
value.equals("1") ||
@@ -255,7 +255,7 @@
* if its a String, return isTrueExplicitly((String)value).
* All other types return 'true'
*/
- public static final boolean isTrueExplicitly(Object value, boolean defaultVal) {
+ public static boolean isTrueExplicitly(Object value, boolean defaultVal) {
if (value == null) {
return defaultVal;
}
@@ -271,7 +271,7 @@
return true;
}
- public static final boolean isTrueExplicitly(Object value) {
+ public static boolean isTrueExplicitly(Object value) {
return isTrueExplicitly(value, false);
}
@@ -283,11 +283,11 @@
* if its a String, return 'false' if its 'false', 'no', or '0' - else 'true'
* All other types return 'true'
*/
- public static final boolean isTrue(Object value, boolean defaultVal) {
+ public static boolean isTrue(Object value, boolean defaultVal) {
return !isFalseExplicitly(value, !defaultVal);
}
- public static final boolean isTrue(Object value) {
+ public static boolean isTrue(Object value) {
return isTrue(value, false);
}
@@ -298,7 +298,7 @@
* Follow in 'C' tradition of boolean values:
* false is specific (0), everything else is true;
*/
- public static final boolean isFalse(String value) {
+ public static boolean isFalse(String value) {
return isFalseExplicitly(value);
}
@@ -306,7 +306,7 @@
* Tests the String 'value':
* return 'true' if its null, 'false', '0', or 'no' - else 'false'
*/
- public static final boolean isFalseExplicitly(String value) {
+ public static boolean isFalseExplicitly(String value) {
return value == null ||
value.equalsIgnoreCase("false") ||
value.equals("0") ||
@@ -321,7 +321,7 @@
* if its a String, return isFalseExplicitly((String)value).
* All other types return 'false'
*/
- public static final boolean isFalseExplicitly(Object value, boolean defaultVal) {
+ public static boolean isFalseExplicitly(Object value, boolean defaultVal) {
if (value == null) {
return defaultVal;
}
@@ -337,7 +337,7 @@
return false;
}
- public static final boolean isFalseExplicitly(Object value) {
+ public static boolean isFalseExplicitly(Object value) {
return isFalseExplicitly(value, true);
}
@@ -349,11 +349,11 @@
* if its a String, return 'false' if its 'false', 'no', or '0' - else 'true'
* All other types return 'true'
*/
- public static final boolean isFalse(Object value, boolean defaultVal) {
+ public static boolean isFalse(Object value, boolean defaultVal) {
return isFalseExplicitly(value, defaultVal);
}
- public static final boolean isFalse(Object value) {
+ public static boolean isFalse(Object value) {
return isFalse(value, true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org