MAPREDUCE-4395. Possible NPE at ClientDistributedCacheManager#determineTimestamps (Bhallamudi via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362052 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
0f122c209d
commit
612443951b
|
@ -202,8 +202,12 @@ public class StringUtils {
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param str
|
||||
* The string array to be parsed into an URI array.
|
||||
* @return <tt>null</tt> if str is <tt>null</tt>, else the URI array
|
||||
* equivalent to str.
|
||||
* @throws IllegalArgumentException
|
||||
* If any string in str violates RFC 2396.
|
||||
*/
|
||||
public static URI[] stringToURI(String[] str){
|
||||
if (str == null)
|
||||
|
@ -213,9 +217,8 @@ public class StringUtils {
|
|||
try{
|
||||
uris[i] = new URI(str[i]);
|
||||
}catch(URISyntaxException ur){
|
||||
System.out.println("Exception in specified URI's " + StringUtils.stringifyException(ur));
|
||||
//making sure its asssigned to null in case of an error
|
||||
uris[i] = null;
|
||||
throw new IllegalArgumentException(
|
||||
"Failed to create uri for " + str[i], ur);
|
||||
}
|
||||
}
|
||||
return uris;
|
||||
|
|
|
@ -269,6 +269,17 @@ public class TestStringUtils extends UnitTestcaseTimeLimit {
|
|||
assertEquals("Yy", StringUtils.camelize("yY"));
|
||||
assertEquals("Zz", StringUtils.camelize("zZ"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testStringToURI() {
|
||||
String[] str = new String[] { "file://" };
|
||||
try {
|
||||
StringUtils.stringToURI(str);
|
||||
fail("Ignoring URISyntaxException while creating URI from string file://");
|
||||
} catch (IllegalArgumentException iae) {
|
||||
assertEquals("Failed to create uri for file://", iae.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
// Benchmark for StringUtils split
|
||||
public static void main(String []args) {
|
||||
|
|
|
@ -236,6 +236,9 @@ Branch-2 ( Unreleased changes )
|
|||
HADOOP-8499. Lower min.user.id to 500 for the tests.
|
||||
(Colin Patrick McCabe via eli)
|
||||
|
||||
MAPREDUCE-4395. Possible NPE at ClientDistributedCacheManager
|
||||
#determineTimestamps (Bhallamudi via bobby)
|
||||
|
||||
Release 2.0.0-alpha - 05-23-2012
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
Loading…
Reference in New Issue