diff options
| author | slewis | 2015-07-14 15:24:11 +0000 |
|---|---|---|
| committer | slewis | 2015-07-14 15:24:11 +0000 |
| commit | 7ce7048b60c9145dc71e97d09b37e5dfd4c0b8c0 (patch) | |
| tree | c1ade93c6dc33e681ca9c212b68b363d072ebf2c /osgi | |
| parent | b5f06545187b808e89aa16129949f37cdad4e0fe (diff) | |
| download | org.eclipse.ecf-7ce7048b60c9145dc71e97d09b37e5dfd4c0b8c0.tar.gz org.eclipse.ecf-7ce7048b60c9145dc71e97d09b37e5dfd4c0b8c0.tar.xz org.eclipse.ecf-7ce7048b60c9145dc71e97d09b37e5dfd4c0b8c0.zip | |
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=472627
Change-Id: I97ac2e614db55bf9afd3c7fe45775814a322d535
Diffstat (limited to 'osgi')
| -rw-r--r-- | osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionWriter.java | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionWriter.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionWriter.java index e672bdd08..6955ccdbd 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionWriter.java +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionWriter.java @@ -222,24 +222,26 @@ public class EndpointDescriptionWriter { Writer writer, org.osgi.service.remoteserviceadmin.EndpointDescription endpointDescription) throws IOException { - writeEndpointDescriptions( - writer, - new org.osgi.service.remoteserviceadmin.EndpointDescription[] { endpointDescription }); + if (endpointDescription != null) + writeEndpointDescriptions( + writer, + new org.osgi.service.remoteserviceadmin.EndpointDescription[] { endpointDescription }); } public void writeEndpointDescriptions( Writer writer, org.osgi.service.remoteserviceadmin.EndpointDescription[] endpointDescriptions) throws IOException { - - indent(0, writer); - writer.append("<endpoint-descriptions xmlns=\"http://www.osgi.org/xmlns/rsa/v1.0.0\">"); //$NON-NLS-1$ - newLine(writer); - for (int i = 0; i < endpointDescriptions.length; i++) - writeEndpointDescription(1, writer, endpointDescriptions[i]); - indent(0, writer); - writer.append("</endpoint-descriptions>"); //$NON-NLS-1$ - newLine(writer); + if (endpointDescriptions != null) { + indent(0, writer); + writer.append("<endpoint-descriptions xmlns=\"http://www.osgi.org/xmlns/rsa/v1.0.0\">"); //$NON-NLS-1$ + newLine(writer); + for (int i = 0; i < endpointDescriptions.length; i++) + writeEndpointDescription(1, writer, endpointDescriptions[i]); + indent(0, writer); + writer.append("</endpoint-descriptions>"); //$NON-NLS-1$ + newLine(writer); + } } protected void writeEndpointDescription( @@ -247,13 +249,15 @@ public class EndpointDescriptionWriter { Writer writer, org.osgi.service.remoteserviceadmin.EndpointDescription endpointDescription) throws IOException { - indent(indentLevel, writer); - writer.append("<endpoint-description>"); //$NON-NLS-1$ - newLine(writer); - writeProperties(indentLevel, writer, endpointDescription); - indent(indentLevel, writer); - writer.append("</endpoint-description>"); //$NON-NLS-1$ - newLine(writer); + if (endpointDescription != null) { + indent(indentLevel, writer); + writer.append("<endpoint-description>"); //$NON-NLS-1$ + newLine(writer); + writeProperties(indentLevel, writer, endpointDescription); + indent(indentLevel, writer); + writer.append("</endpoint-description>"); //$NON-NLS-1$ + newLine(writer); + } } protected void writeProperties( |