HBASE-1063 File separator problem on Windows
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@726565 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2455174c07
commit
6e9aa2affa
|
@ -107,6 +107,7 @@ Release 0.19.0 - Unreleased
|
||||||
HBASE-1052 Stopping a HRegionServer with unflushed cache causes data loss
|
HBASE-1052 Stopping a HRegionServer with unflushed cache causes data loss
|
||||||
from org.apache.hadoop.hbase.DroppedSnapshotException
|
from org.apache.hadoop.hbase.DroppedSnapshotException
|
||||||
HBASE-1059 ConcurrentModificationException in notifyChangedReadersObservers
|
HBASE-1059 ConcurrentModificationException in notifyChangedReadersObservers
|
||||||
|
HBASE-1063 "File separator problem on Windows" (Max Lehn via Stack)
|
||||||
|
|
||||||
IMPROVEMENTS
|
IMPROVEMENTS
|
||||||
HBASE-901 Add a limit to key length, check key and value length on client side
|
HBASE-901 Add a limit to key length, check key and value length on client side
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.hadoop.hbase.util;
|
package org.apache.hadoop.hbase.util;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
||||||
|
@ -101,12 +99,7 @@ public class InfoServer extends HttpServer {
|
||||||
public static String getWebAppDir(final String webappName)
|
public static String getWebAppDir(final String webappName)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
String webappDir = null;
|
String webappDir = null;
|
||||||
try {
|
webappDir = getWebAppsPath("webapps/" + webappName);
|
||||||
webappDir = getWebAppsPath("webapps" + File.separator + webappName);
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
// Retry. Resource may be inside jar on a windows machine.
|
|
||||||
webappDir = getWebAppsPath("webapps/" + webappName);
|
|
||||||
}
|
|
||||||
return webappDir;
|
return webappDir;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue