Author: veithen
Date: Sun Jul 11 16:10:48 2010
New Revision: 963098
URL: http://svn.apache.org/viewvc?rev=963098&view=rev
Log:
AXIS2-4768: Merged r963081 to the 1.5 branch because the issue causes a
regression when upgrading from Axiom 1.2.8 to 1.2.9.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:944347,944915,951385
+/axis/axis2/java/core/trunk:944347,944915,951385,963081
/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630,803725,834058,904780
Modified:
axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?rev=963098&r1=963097&r2=963098&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
Sun Jul 11 16:10:48 2010
@@ -170,12 +170,8 @@ public class ADBXMLStreamReaderImpl impl
* @throws IllegalArgumentException
*/
public Object getProperty(String key) throws IllegalArgumentException {
- if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
- if (OPTIMIZATION_ENABLED.equals(key)) {
- return Boolean.TRUE;
- } else {
- return null;
- }
+ if (OPTIMIZATION_ENABLED.equals(key)) {
+ return Boolean.TRUE;
} else if (state == TEXT_STATE) {
if (IS_BINARY.equals(key)) {
return Boolean.FALSE;
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385,963081
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630,803725,834058,904780
Modified:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java?rev=963098&r1=963097&r2=963098&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
Sun Jul 11 16:10:48 2010
@@ -308,11 +308,7 @@ public class StreamWrapper implements XM
}
public Object getProperty(String s) throws IllegalArgumentException {
- if (state != STATE_INIT) {
- return realReader.getProperty(s);
- } else {
- throw new IllegalArgumentException();
- }
+ return realReader.getProperty(s);
}
public String getText() {
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347,944915,951385
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347,944915,951385,963081
/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347,944915,951385
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347,944915,951385,963081
/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:944347,944915,951385
+/axis/axis2/java/core/trunk/modules/transport/http/src:944347,944915,951385,963081
/webservices/axis2/trunk/java/modules/transport/http/src:771051,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:944347,944915,951385
+/axis/axis2/java/core/trunk/modules/transport/local:944347,944915,951385,963081
/webservices/axis2/trunk/java/modules/transport/local:771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:944347,944915,951385
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:944347,944915,951385,963081
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:944347,944915,951385
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:944347,944915,951385,963081
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,801630,803725,834058,904780
