You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2008/12/14 23:28:30 UTC

svn commit: r726565 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/util/InfoServer.java

Author: stack
Date: Sun Dec 14 14:28:30 2008
New Revision: 726565

URL: http://svn.apache.org/viewvc?rev=726565&view=rev
Log:
HBASE-1063 File separator problem on Windows

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=726565&r1=726564&r2=726565&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Sun Dec 14 14:28:30 2008
@@ -107,6 +107,7 @@
    HBASE-1052  Stopping a HRegionServer with unflushed cache causes data loss
                from org.apache.hadoop.hbase.DroppedSnapshotException
    HBASE-1059  ConcurrentModificationException in notifyChangedReadersObservers
+   HBASE-1063  "File separator problem on Windows" (Max Lehn via Stack)
 
   IMPROVEMENTS
    HBASE-901   Add a limit to key length, check key and value length on client side

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java?rev=726565&r1=726564&r2=726565&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/InfoServer.java Sun Dec 14 14:28:30 2008
@@ -17,8 +17,6 @@
  */
 package org.apache.hadoop.hbase.util;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
 
@@ -101,12 +99,7 @@
   public static String getWebAppDir(final String webappName)
   throws IOException {
     String webappDir = null;
-    try {
-      webappDir = getWebAppsPath("webapps" + File.separator + webappName);
-    } catch (FileNotFoundException e) {
-      // Retry.  Resource may be inside jar on a windows machine.
-      webappDir = getWebAppsPath("webapps/" + webappName);
-    }
+    webappDir = getWebAppsPath("webapps/" + webappName);
     return webappDir;
   }
 }