diff options
| author | slewis | 2011-04-03 23:49:25 +0000 |
|---|---|---|
| committer | slewis | 2011-04-03 23:49:25 +0000 |
| commit | 9fc49779d5a422c1abeaf586b2f8d862dafe018f (patch) | |
| tree | f879e4df9884bd217752fa8d820c5a46422a279d /osgi | |
| parent | 9bc556b30964a593b86cc8c55e804f2c5570e9df (diff) | |
| download | org.eclipse.ecf-9fc49779d5a422c1abeaf586b2f8d862dafe018f.tar.gz org.eclipse.ecf-9fc49779d5a422c1abeaf586b2f8d862dafe018f.tar.xz org.eclipse.ecf-9fc49779d5a422c1abeaf586b2f8d862dafe018f.zip | |
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=341719
Diffstat (limited to 'osgi')
| -rw-r--r-- | osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/EndpointDescriptionParser.java | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/EndpointDescriptionParser.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/EndpointDescriptionParser.java index 9783f6f3d..417317d50 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/EndpointDescriptionParser.java +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/EndpointDescriptionParser.java @@ -318,29 +318,23 @@ public class EndpointDescriptionParser { class EndpointDescriptionsHandler extends RootHandler {
private List<EndpointDescription> endpointDescriptions = new ArrayList<EndpointDescription>();
- private EndpointDescriptionHandler endpointDescriptionHandler;
protected void handleRootAttributes(Attributes attributes) {
}
public void startElement(String name, Attributes attributes)
throws SAXException {
- if (ENDPOINT_DESCRIPTION.equals(name)) {
- if (endpointDescriptionHandler == null) {
- endpointDescriptionHandler = new EndpointDescriptionHandler(
- this, attributes, endpointDescriptions);
- } else
- duplicateElement(this, name, attributes);
- } else
+ if (ENDPOINT_DESCRIPTION.equals(name))
+ new EndpointDescriptionHandler(
+ this, attributes, endpointDescriptions);
+ else
invalidElement(name, attributes);
}
public void endElement(String namespaceURI, String localName,
String qName) {
- if (elementHandled.equals(localName)) {
- endpointDescriptionHandler = null;
+ if (elementHandled.equals(localName))
super.endElement(namespaceURI, localName, qName);
- }
}
public List<EndpointDescription> getEndpointDescriptions() {
@@ -363,15 +357,14 @@ public class EndpointDescriptionParser { public void startElement(String name, Attributes attributes)
throws SAXException {
- if (ENDPOINT_PROPERTY.equals(name)) {
+ if (ENDPOINT_PROPERTY.equals(name))
new EndpointPropertyHandler(this, attributes, properties);
- }
}
public void endElement(String namespaceURI, String localName,
String qName) {
if (elementHandled.equals(localName)) {
- this.descriptions.add(new EndpointDescription(properties));
+ descriptions.add(new EndpointDescription(properties));
super.endElement(namespaceURI, localName, qName);
}
}
|