summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntje Fuhrmann2013-02-01 07:17:09 (EST)
committer Sven Rottstock2013-02-01 07:17:09 (EST)
commitc47ed39ddb99b905f830450704a3e706420578ff (patch)
treeec25048b92c8ca7d8e0b3d246d00ac913b3675a5
parentb11c844b93e629f7b03d1b53fa1f397f2a04a09a (diff)
downloadorg.eclipse.stardust.engine-c47ed39ddb99b905f830450704a3e706420578ff.zip
org.eclipse.stardust.engine-c47ed39ddb99b905f830450704a3e706420578ff.tar.gz
org.eclipse.stardust.engine-c47ed39ddb99b905f830450704a3e706420578ff.tar.bz2
Jira-ID: CRNT-27311
For sysconsole command "fixruntimeoids", log file is created even when "-nolog" option is set. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/engine@62710 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/FixRuntimeOidCommand.java3
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/RuntimeOidPatcher.java12
2 files changed, 11 insertions, 4 deletions
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/FixRuntimeOidCommand.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/FixRuntimeOidCommand.java
index f59b8b4..2135c3f 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/FixRuntimeOidCommand.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/FixRuntimeOidCommand.java
@@ -37,8 +37,9 @@ public class FixRuntimeOidCommand extends AuditTrailCommand
{
boolean logOnly = options.containsKey(LOG_ONLY_ARG);
boolean noLog = options.containsKey(NO_LOG_ARG);
+ boolean useNewOid = true;
- RuntimeOidPatcher patcher = new RuntimeOidPatcher(logOnly, noLog);
+ RuntimeOidPatcher patcher = new RuntimeOidPatcher(logOnly, useNewOid, noLog);
patcher.patch();
return 0;
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/RuntimeOidPatcher.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/RuntimeOidPatcher.java
index 02569d4..806cf5b 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/RuntimeOidPatcher.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/cli/sysconsole/patch/RuntimeOidPatcher.java
@@ -75,10 +75,13 @@ public class RuntimeOidPatcher
private boolean useNewOid;
- public RuntimeOidPatcher(boolean logOnly, boolean useNewOid)
+ private final boolean noLog;
+
+ public RuntimeOidPatcher(boolean logOnly, boolean useNewOid, boolean noLog)
{
this.logOnly = logOnly;
this.useNewOid = useNewOid;
+ this.noLog = noLog;
}
private Session obtainSession() throws SQLException
@@ -183,8 +186,11 @@ public class RuntimeOidPatcher
}
- // log what the program is about to do
- logOperations(patchesByPartitionOid);
+ if (!noLog)
+ {
+ // log what the program is about to do
+ logOperations(patchesByPartitionOid);
+ }
if (!logOnly)
{