aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Janik2011-07-27 06:13:25 (EDT)
committerTomasz Zarna2011-07-27 06:13:25 (EDT)
commite91ebdb8cffb17eb3811d729e8be194b3dbde218 (patch)
treebe949ffe7446b80eebb28a0a5a0ce44a63441a10
parent1ca5969469140be2540904ada1d889cbc12c102e (diff)
downloadorg.eclipse.orion.server-e91ebdb8cffb17eb3811d729e8be194b3dbde218.zip
org.eclipse.orion.server-e91ebdb8cffb17eb3811d729e8be194b3dbde218.tar.gz
org.eclipse.orion.server-e91ebdb8cffb17eb3811d729e8be194b3dbde218.tar.bz2
bug 345898 - [server][clone] GitCloneTest#testCloneNotGitRepository
prints a stack trace on console https://bugs.eclipse.org/bugs/show_bug.cgi?id=345898
-rw-r--r--bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/CloneJob.java3
-rw-r--r--bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/FetchJob.java2
-rw-r--r--bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/InitJob.java2
-rw-r--r--bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/PushJob.java2
4 files changed, 4 insertions, 5 deletions
diff --git a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/CloneJob.java b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/CloneJob.java
index 0caa1da..14caaac 100644
--- a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/CloneJob.java
+++ b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/CloneJob.java
@@ -116,7 +116,6 @@ public class CloneJob extends GitJob {
} finally {
cleanUp();
}
- //return the actual result so errors are logged
- return result;
+ return Status.OK_STATUS; // see bug 353190
}
}
diff --git a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/FetchJob.java b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/FetchJob.java
index e39b839..d679f65 100644
--- a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/FetchJob.java
+++ b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/FetchJob.java
@@ -136,6 +136,6 @@ public class FetchJob extends GitJob {
task.setMessage(NLS.bind("Fetching {0} done", remote));
updateTask(task);
cleanUp();
- return Status.OK_STATUS;
+ return Status.OK_STATUS; // see bug 353190
}
}
diff --git a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/InitJob.java b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/InitJob.java
index 0c3ea44..4df8b4e 100644
--- a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/InitJob.java
+++ b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/InitJob.java
@@ -89,7 +89,7 @@ public class InitJob extends GitJob {
}
task.done(result);
updateTask(task);
- //return the actual result so errors are logged
+ //return the actual result so errors are logged, see bug 353190
return result;
} finally {
cleanUp();
diff --git a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/PushJob.java b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/PushJob.java
index d71ba79..3fe5be7 100644
--- a/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/PushJob.java
+++ b/bundles/org.eclipse.orion.server.git/src/org/eclipse/orion/server/git/servlets/PushJob.java
@@ -125,6 +125,6 @@ public class PushJob extends GitJob {
task.setMessage(NLS.bind("Pushing {0} done", path.segment(0)));
updateTask(task);
cleanUp();
- return Status.OK_STATUS;
+ return Status.OK_STATUS; // see bug 353190
}
}