Bug 296851 - pluginCustomization argument should be removed from nonFrameworkArgs after being processed
diff --git a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
index e865ce0..424ddbf 100755
--- a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.equinox.internal.app.Activator
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/CommandLineArgs.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/CommandLineArgs.java
index 16b3422..ddf3dba 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/CommandLineArgs.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/CommandLineArgs.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
private static final String UPDATE = "-update"; //$NON-NLS-1$
private static final String PASSWORD = "-password"; //$NON-NLS-1$
private static final String KEYRING = "-keyring"; //$NON-NLS-1$
+ private static final String PLUGIN_CUSTOMIZATION = "-pluginCustomization"; //$NON-NLS-1$
// supported command line args
private static final String PRODUCT = "-product"; //$NON-NLS-1$
@@ -73,6 +74,8 @@
found = true; // ignored
if (args[i].equalsIgnoreCase(PASSWORD))
found = true; // ignored
+ if (args[i].equalsIgnoreCase(PLUGIN_CUSTOMIZATION))
+ found = true; // ignored
// done checking obsolete for args. Remember where an arg was found
if (found) {
