Author: cutting
Date: Tue May 15 13:59:21 2007
New Revision: 538316
URL: http://svn.apache.org/viewvc?view=rev&rev=538316
Log:
HADOOP-1354. Fix a potential NullPointerException in FsShell. Contributed by
Hairong.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FsShell.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=538316&r1=538315&r2=538316
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue May 15 13:59:21 2007
@@ -398,6 +398,9 @@
114. HADOOP-1353. Fix a potential NullPointerException in namenode.
(Dhruba Borthakur via cutting)
+115. HADOOP-1354. Fix a potential NullPointerException in FsShell.
+ (Hairong Kuang via cutting)
+
Release 0.12.3 - 2007-04-06
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FsShell.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FsShell.java?view=diff&rev=538316&r1=538315&r2=538316
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FsShell.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/fs/FsShell.java Tue May 15
13:59:21 2007
@@ -369,7 +369,7 @@
*/
public void dus(String src) throws IOException {
Path paths[] = fs.globPaths(new Path(src));
- if (paths==null && paths.length==0) {
+ if (paths==null || paths.length==0) {
throw new IOException("dus: No match: " + src);
}
for(int i=0; i<paths.length; i++) {
