Merge pull request #353 from codenvy/CLDIDE-2593

CLDIDE-2593: makes changes related to bugs found by SAP Fortify tool
codenvy-legacy · Nov 4, 2015 · 4df7a97 · 4df7a97
2 parents dd6b321 + aadc44d
commit 4df7a97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/...git/src/main/java/org/eclipse/che/ide/ext/git/client/remove/RemoveFromIndexPresenter.java b/...git/src/main/java/org/eclipse/che/ide/ext/git/client/remove/RemoveFromIndexPresenter.java
@@ -185,22 +185,20 @@ protected void onFailure(Throwable exception) {
     protected ResourceBasedNode<?> getResourceBasedNode() {
         List<?> selection = projectExplorer.getSelection().getAllElements();
         //we should be sure that user selected single element to work with it
-        if (selection != null && selection.isEmpty() || selection.size() > 1) {
-            return null;
-        }
+        if (selection != null && selection.size() > 1) {
 
-        Object o = selection.get(0);
+            Object o = selection.get(0);
 
-        if (o instanceof ResourceBasedNode<?>) {
-            ResourceBasedNode<?> node = (ResourceBasedNode<?>)o;
-            //it may be file node, so we should take parent node
-            if (node.isLeaf() && isResourceAndStorableNode(node.getParent())) {
-                return (ResourceBasedNode<?>)node.getParent();
-            }
+            if (o instanceof ResourceBasedNode<?>) {
+                ResourceBasedNode<?> node = (ResourceBasedNode<?>)o;
+                //it may be file node, so we should take parent node
+                if (node.isLeaf() && isResourceAndStorableNode(node.getParent())) {
+                    return (ResourceBasedNode<?>)node.getParent();
+                }
 
-            return isResourceAndStorableNode(node) ? node : null;
+                return isResourceAndStorableNode(node) ? node : null;
+            }
         }
-
         return null;
     }
 

diff --git a/...n/java/org/eclipse/che/ide/ext/git/server/nativegit/CheAccessTokenCredentialProvider.java b/...n/java/org/eclipse/che/ide/ext/git/server/nativegit/CheAccessTokenCredentialProvider.java
@@ -75,8 +75,7 @@ public GitUser getUser() throws GitException {
                                                                                "git.committer.\\w+");
                 name = preferences.get("git.committer.name");
                 email = preferences.get("git.committer.email");
-            } catch (ServerException e) {
-                //ignored
+            } catch (ServerException ignored) {
             }
 
             gitUser.setName(isNullOrEmpty(name) ? "Anonymous" : name);