Author: fmeschbe
Date: Tue May 31 13:52:45 2011
New Revision: 1129674
URL: http://svn.apache.org/viewvc?rev=1129674&view=rev
Log:
FELIX-2944 better handle the case of unknown namespaces and ignored elements
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java?rev=1129674&r1=1129673&r2=1129674&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/XmlHandler.java
Tue May 31 13:52:45 2011
@@ -28,7 +28,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-
import org.apache.felix.scr.impl.helper.Logger;
import org.apache.felix.scr.impl.parser.KXml2SAXHandler;
import org.apache.felix.scr.impl.parser.ParseException;
@@ -230,6 +229,14 @@ public class XmlHandler implements KXml2
m_components.add( m_currentComponent );
}
+ // not inside a component element, ignore current element
+ else if ( !this.isComponent )
+ {
+ m_logger.log( LogService.LOG_DEBUG,
+ "Not currently parsing a component; ignoring element
{0} (bundle {1})", new Object[]
+ { localName, m_bundle.getLocation() }, null, null
);
+ }
+
// 112.4.4 Implementation
else if ( localName.equals( "implementation" ) )
{
