You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hdt.apache.org by rs...@apache.org on 2013/11/13 12:12:07 UTC
git commit: fixed HDT-44 and some other issues - Added fragment.xml
to jar - changed ids in plugin.xml to make the different - fixed NPE
Updated Branches:
refs/heads/hadoop-eclipse-merge-development b89b797fb -> 375515636
fixed HDT-44 and some other issues - Added fragment.xml to jar - changed ids in plugin.xml to make the different - fixed NPE
Signed-off-by: Rahul Sharma <rs...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/37551563
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/37551563
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/37551563
Branch: refs/heads/hadoop-eclipse-merge-development
Commit: 37551563654d5de0d695fb6fe87622fdd3bafecf
Parents: b89b797
Author: Rahul Sharma <rs...@apache.org>
Authored: Wed Oct 30 12:26:28 2013 +0530
Committer: Rahul Sharma <rs...@apache.org>
Committed: Wed Nov 13 16:39:19 2013 +0530
----------------------------------------------------------------------
.../src/org/apache/hdt/core/internal/hdfs/HDFSFileStore.java | 3 ++-
org.apache.hdt.hadoop.release/build.properties | 1 +
org.apache.hdt.ui/plugin.xml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/37551563/org.apache.hdt.core/src/org/apache/hdt/core/internal/hdfs/HDFSFileStore.java
----------------------------------------------------------------------
diff --git a/org.apache.hdt.core/src/org/apache/hdt/core/internal/hdfs/HDFSFileStore.java b/org.apache.hdt.core/src/org/apache/hdt/core/internal/hdfs/HDFSFileStore.java
index b84221c..ffd68ec 100644
--- a/org.apache.hdt.core/src/org/apache/hdt/core/internal/hdfs/HDFSFileStore.java
+++ b/org.apache.hdt.core/src/org/apache/hdt/core/internal/hdfs/HDFSFileStore.java
@@ -319,7 +319,8 @@ public class HDFSFileStore extends FileStore {
if (logger.isDebugEnabled())
logger.debug("[" + uri + "]: getParent()");
try {
- return new HDFSFileStore(uri.removeLastSegment());
+ HDFSURI hdfsParentUri = uri.removeLastSegment();
+ return hdfsParentUri != null ? new HDFSFileStore(hdfsParentUri) : null;
} catch (URISyntaxException e) {
logger.log(Level.WARN, e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/37551563/org.apache.hdt.hadoop.release/build.properties
----------------------------------------------------------------------
diff --git a/org.apache.hdt.hadoop.release/build.properties b/org.apache.hdt.hadoop.release/build.properties
index 25b9643..6d99810 100644
--- a/org.apache.hdt.hadoop.release/build.properties
+++ b/org.apache.hdt.hadoop.release/build.properties
@@ -19,6 +19,7 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
+ fragment.xml,\
jars/,\
jars/slf4j-api-1.6.1.jar,\
jars/slf4j-log4j12-1.6.1.jar,\
http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/37551563/org.apache.hdt.ui/plugin.xml
----------------------------------------------------------------------
diff --git a/org.apache.hdt.ui/plugin.xml b/org.apache.hdt.ui/plugin.xml
index 2051a9f..e6f1e53 100644
--- a/org.apache.hdt.ui/plugin.xml
+++ b/org.apache.hdt.ui/plugin.xml
@@ -403,7 +403,7 @@
<action
class="org.apache.hdt.ui.internal.zookeeper.NewZooKeeperServerAction"
icon="icons/hadoop-zookeeper-new.png"
- id="org.apache.hdt.ui.action.new.hdfs"
+ id="org.apache.hdt.ui.action.new.zk"
label="New ZooKeeper Server"
style="push"
toolbarPath="new.group"