Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstefan.brockmann@btc-ag.com2016-01-21 07:45:09 -0500
committerstefan.brockmann@btc-ag.com2016-01-21 07:45:09 -0500
commitd77a671cf35cc9fd195a5d98deafc26612ee3666 (patch)
tree718ab7382f76b92ee52ba73e4ef53b223ec35b31
parent2eb814915c1461c3ae12ac589a93bdb9d9dfab09 (diff)
downloadorg.eclipse.openk-platform.openk-repo-d77a671cf35cc9fd195a5d98deafc26612ee3666.tar.gz
org.eclipse.openk-platform.openk-repo-d77a671cf35cc9fd195a5d98deafc26612ee3666.tar.xz
org.eclipse.openk-platform.openk-repo-d77a671cf35cc9fd195a5d98deafc26612ee3666.zip
Ersatzwertverfahren korrigiert.
-rwxr-xr-xopenk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/ActivityRestController.java2
-rw-r--r--openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/util/SubstationToolkit.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/ActivityRestController.java b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/ActivityRestController.java
index 4645ec95..acac4fc3 100755
--- a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/ActivityRestController.java
+++ b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/ActivityRestController.java
@@ -284,7 +284,7 @@ public class ActivityRestController extends AbstractRestController {
final long dateFinished = activityJpa.getUserSettingsJpa().getDateFinished().getTime();
final long now = now().getTime();
- if (dateFinished >= now) {
+ if (dateFinished <= now) {
throw new IllegalArgumentException("Process '" + id + "' is already finished!");
}
diff --git a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/util/SubstationToolkit.java b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/util/SubstationToolkit.java
index 4eebebad..aceb5df7 100644
--- a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/util/SubstationToolkit.java
+++ b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/adapter/rest/controller/util/SubstationToolkit.java
@@ -95,7 +95,7 @@ public final class SubstationToolkit {
break;
default:
- throw new IllegalArgumentException("preselectionConfiguration");
+ // TODO Felix: new Fix => throw new IllegalArgumentException("preselectionConfiguration");
}
return tempResult;
@@ -155,7 +155,7 @@ public final class SubstationToolkit {
break;
default:
- throw new IllegalArgumentException("preselectionConfiguration");
+ // TODO Felix: new Fix => throw new IllegalArgumentException("preselectionConfiguration");
}
return tempResult;

Back to the top