[jbosstools-commits] JBoss Tools SVN: r28146 - in branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client: utils and 1 other directory.

Author: adietish Date: 2011-01-12 13:31:13 -0500 (Wed, 12 Jan 2011) New Revision: 28146 Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java Log: [JBIDE-8099] fixed error when unmarshalling instance addresses Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java =================================================================== --- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 18:20:08 UTC (rev 28145) +++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 18:31:13 UTC (rev 28146) @@ -116,4 +116,11 @@ return null; } + protected String stripText(String textContent) { + if (textContent == null || textContent.length() == 0) { + return textContent; + } + return textContent.trim(); + } + } Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java =================================================================== --- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-12 18:20:08 UTC (rev 28145) +++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-12 18:31:13 UTC (rev 28146) @@ -55,7 +55,10 @@ for (int i = 0; i < addressList.getLength(); i++) { Node addressNode = addressList.item(i); if (addressNode != null) { - addresses.add(addressNode.getTextContent()); + String address = stripText(addressNode.getTextContent()); + if (address != null && address.length() > 0) { + addresses.add(address); + } } } return new AddressList(addresses); Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java =================================================================== --- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12 18:20:08 UTC (rev 28145) +++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12 18:31:13 UTC (rev 28146) @@ -94,7 +94,7 @@ public static String toString(InputStream inputStream) throws IOException { StringBuilder builder = new StringBuilder(); for(int character = -1; (character = inputStream.read()) != -1; ) { - builder.append(character); + builder.append((char) character); } return builder.toString(); }