Author: anil.saldhana(a)jboss.com
Date: 2011-03-15 12:39:35 -0400 (Tue, 15 Mar 2011)
New Revision: 811
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/StringUtil.java
federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/SystemPropertyAsStringUnitTestCase.java
Log:
PLFED-138: handle null param with RTE
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/StringUtil.java
===================================================================
---
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/StringUtil.java 2011-03-15
16:32:05 UTC (rev 810)
+++
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/StringUtil.java 2011-03-15
16:39:35 UTC (rev 811)
@@ -77,6 +77,8 @@
*/
public static String getSystemPropertyAsString(String str)
{
+ if (str == null)
+ throw new IllegalArgumentException("str is null");
if (str.contains("${"))
{
Pattern pattern = Pattern.compile("\\$\\{([^}]+)}");
Modified:
federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/SystemPropertyAsStringUnitTestCase.java
===================================================================
---
federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/SystemPropertyAsStringUnitTestCase.java 2011-03-15
16:32:05 UTC (rev 810)
+++
federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/SystemPropertyAsStringUnitTestCase.java 2011-03-15
16:39:35 UTC (rev 811)
@@ -22,6 +22,7 @@
package org.picketlink.test.identity.federation.core.parser;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
@@ -45,6 +46,19 @@
@Test
public void testSystemProperty() throws Exception
{
+ try
+ {
+ assertEquals(null, StringUtil.getSystemPropertyAsString(null));
+ fail("should not have passed");
+ }
+ catch (IllegalArgumentException iae)
+ {
+
+ }
+ catch (Exception e)
+ {
+ fail("unknown ex");
+ }
assertEquals("test",
StringUtil.getSystemPropertyAsString("test"));
assertEquals("test/test",
StringUtil.getSystemPropertyAsString("test/test"));
Show replies by date