Author: asankha
Date: Tue Dec 5 02:29:41 2006
New Revision: 482572
URL: http://svn.apache.org/viewvc?view=rev&rev=482572
Log:
prevent NPE for invalid configurations
update POM versions
Modified:
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
incubator/synapse/trunk/java/pom.xml
Modified:
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java?view=diff&rev=482572&r1=482571&r2=482572
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java
Tue Dec 5 02:29:41 2006
@@ -146,7 +146,12 @@
public Mediator getMediator(OMElement element) {
String localName = element.getLocalName();
- QName qName = new QName(element.getNamespace().getName(),
localName);
+ QName qName = null;
+ if (element.getNamespace() != null) {
+ qName = new QName(element.getNamespace().getName(), localName);
+ } else {
+ qName = new QName(localName);
+ }
log.debug("getMediator(" + qName + ")");
Class cls = (Class) factoryMap.get(qName);
Modified: incubator/synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/pom.xml?view=diff&rev=482572&r1=482571&r2=482572
==============================================================================
--- incubator/synapse/trunk/java/pom.xml (original)
+++ incubator/synapse/trunk/java/pom.xml Tue Dec 5 02:29:41 2006
@@ -26,7 +26,7 @@
<groupId>org.apache.synapse</groupId>
<artifactId>Apache-Synapse-Incubating</artifactId>
- <version>0.90-SNAPSHOT</version>
+ <version>0.90-RC1</version>
<name>Apache Synapse</name>
<description>Apache Synapse</description>
@@ -251,7 +251,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-rahas</artifactId>
- <version>${axis2.security.version}</version>
+ <version>${axis2.version}</version>
</dependency>
<dependency>
@@ -275,7 +275,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-secpolicy</artifactId>
- <version>${axis2.security.version}</version>
+ <version>${axis2.version}</version>
</dependency>
<dependency>
@@ -287,7 +287,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-security</artifactId>
- <version>${axis2.security.version}</version>
+ <version>${axis2.version}</version>
</dependency>
<dependency>
@@ -320,7 +320,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>rampart</artifactId>
- <version>${axis2.security.version}</version>
+ <version>${rampart.version}</version>
<type>mar</type>
</dependency>
@@ -568,18 +568,18 @@
</modules>
<properties>
- <synapse.version>0.90-SNAPSHOT</synapse.version>
+ <synapse.version>0.90-RC1</synapse.version>
<axis2.version>1.1</axis2.version>
- <axis2.security.version>1.1-SNAPSHOT</axis2.security.version>
- <axiom.version>1.2.1-SNAPSHOT</axiom.version>
- <xml_schema.version>1.2</xml_schema.version>
+ <rampart.version>1.1</rampart.version>
+ <axiom.version>1.2.1</axiom.version>
+ <xml_schema.version>SNAPSHOT</xml_schema.version>
<neethi.version>2.0</neethi.version>
- <wss4j.version>SNAPSHOT</wss4j.version>
+ <wss4j.version>1.5.1</wss4j.version>
<xmlsec.version>1.3.0</xmlsec.version>
<woden.version>1.0.0M6</woden.version>
<addressing.version>1.1</addressing.version>
- <sandesha2.version>1.1-SNAPSHOT</sandesha2.version>
+ <sandesha2.version>1.1</sandesha2.version>
<rampart.version>1.1</rampart.version>
<commons.logging.version>1.1</commons.logging.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
