Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-20 06:22:10 +01:00
Code Issues Packages Projects Releases Activity

fix possible NullPointerException

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-08-03 17:03:34 +02:00
parent ddbe198572
commit 04cff2cde9
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scm-core/src/main/java/sonia/scm/xml/XmlMapStringAdapter.java
View File

@@ -33,6 +33,10 @@
package sonia.scm.xml;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import java.util.HashMap;
@@ -61,12 +65,22 @@ public class XmlMapStringAdapter
@Override
public XmlMapStringElement[] marshal(Map<String, String> map) throws Exception
{
XmlMapStringElement[] elements = new XmlMapStringElement[map.size()];
int i = 0;
XmlMapStringElement[] elements = null;
for (Map.Entry<String, String> e : map.entrySet())
if (Util.isNotEmpty(map))
{
elements[i++] = new XmlMapStringElement(e.getKey(), e.getValue());
elements = new XmlMapStringElement[map.size()];
int i = 0;
for (Map.Entry<String, String> e : map.entrySet())
{
elements[i++] = new XmlMapStringElement(e.getKey(), e.getValue());
}
}
else
{
elements = new XmlMapStringElement[0];
}
return elements;
@@ -88,9 +102,12 @@ public class XmlMapStringAdapter
{
Map<String, String> map = new HashMap<String, String>();
for (XmlMapStringElement e : elements)
if (elements != null)
{
map.put(e.getKey(), e.getValue());
for (XmlMapStringElement e : elements)
{
map.put(e.getKey(), e.getValue());
}
}
return map;