rsitze 02/05/09 11:30:46
Modified: java/src/org/apache/axis/encoding/ser ArrayDeserializer.java
JAFDataHandlerDeserializerFactory.java
VectorDeserializer.java MapDeserializer.java
Log:
Remove NLS from log.debug entry/exit, as per logging guidelines
Revision Changes Path
1.11 +6 -15
xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java
Index: ArrayDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ArrayDeserializer.java 16 Apr 2002 20:26:32 -0000 1.10
+++ ArrayDeserializer.java 9 May 2002 18:30:45 -0000 1.11
@@ -144,8 +144,7 @@
// default xsi:type value is used.
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage(
- "enter00", "ArrayDeserializer.startElement()"));
+ log.debug("Enter: ArrayDeserializer::startElement()");
}
// Get the qname for the array type=, set it to null if
@@ -325,9 +324,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(
- JavaUtils.getMessage("exit00",
- "ArrayDeserializer.startElement()"));
+ log.debug("Exit: ArrayDeserializer::startElement()");
}
}
@@ -351,9 +348,7 @@
throws SAXException
{
if (log.isDebugEnabled()) {
- log.debug(
- JavaUtils.getMessage("enter00",
- "ArrayDeserializer.onStartChild()"));
+ log.debug("Enter: ArrayDeserializer.onStartChild()");
}
// If the position attribute is set,
@@ -428,10 +423,9 @@
curIndex++;
if (log.isDebugEnabled()) {
- log.debug(
- JavaUtils.getMessage("exit00",
- "ArrayDeserializer.onStartChild()"));
+ log.debug("Exit: ArrayDeserializer.onStartChild()");
}
+
return (SOAPHandler) dSer;
}
@@ -460,10 +454,7 @@
public void setValue(Object value, Object hint) throws SAXException
{
if (log.isDebugEnabled()) {
- log.debug(
- JavaUtils.getMessage("gotValue00",
- "ArrayDeserializer", "[" + hint +
- "] = " + value));
+ log.debug("Enter: ArrayDeserializer::setValue(" + value + ", " + hint +
")");
}
ArrayList list = (ArrayList)this.value;
int offset = ((Integer)hint).intValue();
1.5 +3 -5
xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerDeserializerFactory.java
Index: JAFDataHandlerDeserializerFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerDeserializerFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JAFDataHandlerDeserializerFactory.java 1 May 2002 20:54:03 -0000 1.4
+++ JAFDataHandlerDeserializerFactory.java 9 May 2002 18:30:45 -0000 1.5
@@ -71,13 +71,11 @@
public JAFDataHandlerDeserializerFactory(Class javaType, QName xmlType) {
super(JAFDataHandlerDeserializer.class, xmlType, javaType);
- log.debug(JavaUtils.getMessage("enter00",
- "JAFDataHandlerDeserializerFactory(" + javaType + ", "
- + xmlType + ")"));
+ log.debug("Enter/Exit: JAFDataHandlerDeserializerFactory(" + javaType + ", "
+ + xmlType + ")");
}
public JAFDataHandlerDeserializerFactory() {
super(JAFDataHandlerDeserializer.class);
- log.debug(JavaUtils.getMessage("enter00",
- "JAFDataHandlerDeserializerFactory()"));
+ log.debug("Enter/Exit: JAFDataHandlerDeserializerFactory()");
}
}
1.5 +4 -4
xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java
Index: VectorDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VectorDeserializer.java 21 Mar 2002 19:10:10 -0000 1.4
+++ VectorDeserializer.java 9 May 2002 18:30:45 -0000 1.5
@@ -108,7 +108,7 @@
DeserializationContext context)
throws SAXException {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
"VectorDeserializer.startElement()"));
+ log.debug("Enter: VectorDeserializer::startElement()");
}
if (attributes.getValue(Constants.URI_CURRENT_SCHEMA_XSI, "nil") != null) {
@@ -119,7 +119,7 @@
setValue(new java.util.Vector());
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
"VectorDeserializer.startElement()"));
+ log.debug("Exit: VectorDeserializer::startElement()");
}
}
@@ -142,7 +142,7 @@
DeserializationContext context)
throws SAXException {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
"VectorDeserializer.onStartChild()"));
+ log.debug("Enter: VectorDeserializer::onStartChild()");
}
if (attributes == null)
@@ -175,7 +175,7 @@
curIndex++;
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
"VectorDeserializer.onStartChild()"));
+ log.debug("Exit: VectorDeserializer::onStartChild()");
}
return (SOAPHandler) dSer;
}
1.5 +10 -4
xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java
Index: MapDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MapDeserializer.java 6 Mar 2002 19:35:49 -0000 1.4
+++ MapDeserializer.java 9 May 2002 18:30:45 -0000 1.5
@@ -115,7 +115,7 @@
DeserializationContext context)
throws SAXException {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
"MapDeserializer.startElement()"));
+ log.debug("Enter MapDeserializer::startElement()");
}
if (attributes.getValue(Constants.URI_CURRENT_SCHEMA_XSI, "nil") != null) {
@@ -126,7 +126,7 @@
setValue(new HashMap());
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
"MapDeserializer.startElement()"));
+ log.debug("Exit: MapDeserializer::startElement()");
}
}
@@ -150,14 +150,20 @@
throws SAXException {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
"MapDeserializer.onStartChild()"));
+ log.debug("Enter: MapDeserializer::onStartChild()");
}
if (!localName.equals("item"))
throw new SAXException(
JavaUtils.getMessage("itemInMap00"));
+
+ SOAPHandler sh = new ItemHandler(this);
- return new ItemHandler(this);
+ if (log.isDebugEnabled()) {
+ log.debug("Exit: MapDeserializer::onStartChild()");
+ }
+
+ return sh;
}
/**
