Author: rgodfrey
Date: Fri May 1 10:17:21 2015
New Revision: 1677105
URL: http://svn.apache.org/r1677105
Log:
QPID-6522 : Applying patch from Lorenz Quack
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java?rev=1677105&r1=1677104&r2=1677105&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
Fri May 1 10:17:21 2015
@@ -243,7 +243,7 @@ public class FileGroupDatabase implement
for (String group : _groupToUserMap.keySet())
{
Set<String> users = _groupToUserMap.get(group);
- final String userList = Joiner.on(",").join(users);
+ final String userList = Joiner.on(",").useForNull("").join(users);
propertiesFile.setProperty(group + ".users", userList);
}
Modified:
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java?rev=1677105&r1=1677104&r2=1677105&view=diff
==============================================================================
---
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
(original)
+++
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/results/formatting/CSVFormatter.java
Fri May 1 10:17:21 2015
@@ -70,8 +70,7 @@ public class CSVFormatter
String attributeValueFormatted = attribute.format(attributeValue);
attributeValues.add(attributeValueFormatted);
}
-
- String row = Joiner.on(',').join(attributeValues.toArray());
+ String row =
Joiner.on(',').useForNull("").join(attributeValues.toArray());
return row + "\n";
}
@@ -84,7 +83,7 @@ public class CSVFormatter
displayNames.add(attribute.getDisplayName());
}
- String header = Joiner.on(',').join(displayNames.toArray());
+ String header =
Joiner.on(',').useForNull("").join(displayNames.toArray());
return header + "\n";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
