diff options
author | Susan McCourt | 2014-02-14 20:43:49 +0000 |
---|---|---|
committer | Susan McCourt | 2014-02-14 20:48:15 +0000 |
commit | b087b40f8c839c12744439ac8a6ca945bae59035 (patch) | |
tree | 1e25bace80380b26a56087faa9b1afa1d3089008 | |
parent | 4ad0e945f22c961b9dddde7b4510d852859ae9dc (diff) | |
download | rt.equinox.p2-b087b40f8c839c12744439ac8a6ca945bae59035.tar.gz rt.equinox.p2-b087b40f8c839c12744439ac8a6ca945bae59035.tar.xz rt.equinox.p2-b087b40f8c839c12744439ac8a6ca945bae59035.zip |
Bug 427155 - [publisher] p2 publisher read and honor OS arch
specification in product file. Remove aggressive trimming of args that
caused Bug 427956.
Change-Id: If209c4958dbe7ef7353d95f595ea6022173afdde
Signed-off-by: Susan McCourt <susan@rapicorp.com>
-rw-r--r-- | bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java index ad600c0e2..6a1e5e7ba 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java @@ -896,55 +896,55 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { public void characters(char[] ch, int start, int length) { switch (state) { case STATE_PROGRAM_ARGS : - addLaunchArgumentToMap(PROGRAM_ARGS, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(PROGRAM_ARGS, String.valueOf(ch, start, length)); break; case STATE_PROGRAM_ARGS_LINUX : - addLaunchArgumentToMap(PROGRAM_ARGS_LINUX, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(PROGRAM_ARGS_LINUX, String.valueOf(ch, start, length)); break; case STATE_PROGRAM_ARGS_MAC : - addLaunchArgumentToMap(PROGRAM_ARGS_MAC, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(PROGRAM_ARGS_MAC, String.valueOf(ch, start, length)); break; case STATE_PROGRAM_ARGS_SOLARIS : - addLaunchArgumentToMap(PROGRAM_ARGS_SOLARIS, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(PROGRAM_ARGS_SOLARIS, String.valueOf(ch, start, length)); break; case STATE_PROGRAM_ARGS_WIN : - addLaunchArgumentToMap(PROGRAM_ARGS_WIN, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(PROGRAM_ARGS_WIN, String.valueOf(ch, start, length)); break; case STATE_VM_ARGS : - addLaunchArgumentToMap(VM_ARGS, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(VM_ARGS, String.valueOf(ch, start, length)); break; case STATE_VM_ARGS_LINUX : - addLaunchArgumentToMap(VM_ARGS_LINUX, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(VM_ARGS_LINUX, String.valueOf(ch, start, length)); break; case STATE_VM_ARGS_MAC : - addLaunchArgumentToMap(VM_ARGS_MAC, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(VM_ARGS_MAC, String.valueOf(ch, start, length)); break; case STATE_VM_ARGS_SOLARIS : - addLaunchArgumentToMap(VM_ARGS_SOLARIS, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(VM_ARGS_SOLARIS, String.valueOf(ch, start, length)); break; case STATE_VM_ARGS_WIN : - addLaunchArgumentToMap(VM_ARGS_WIN, String.valueOf(ch, start, length).trim()); + addLaunchArgumentToMap(VM_ARGS_WIN, String.valueOf(ch, start, length)); break; case STATE_ARCH_X86 : - addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_X86, String.valueOf(ch, start, length).trim()); //$NON-NLS-1$ + addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_X86, String.valueOf(ch, start, length)); //$NON-NLS-1$ break; case STATE_ARCH_X86_64 : - addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_X86_64, String.valueOf(ch, start, length).trim()); //$NON-NLS-1$ + addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_X86_64, String.valueOf(ch, start, length)); //$NON-NLS-1$ break; case STATE_ARCH_PPC : - addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_PPC, String.valueOf(ch, start, length).trim()); //$NON-NLS-1$ + addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_PPC, String.valueOf(ch, start, length)); //$NON-NLS-1$ break; case STATE_ARCH_IA_64 : - addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_IA_64, String.valueOf(ch, start, length).trim()); //$NON-NLS-1$ + addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_IA_64, String.valueOf(ch, start, length)); //$NON-NLS-1$ break; case STATE_ARCH_IA_64_32 : - addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_IA_64_32, String.valueOf(ch, start, length).trim()); //$NON-NLS-1$ + addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_IA_64_32, String.valueOf(ch, start, length)); //$NON-NLS-1$ break; case STATE_ARCH_PA_RISC : - addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_PA_RISC, String.valueOf(ch, start, length).trim()); //$NON-NLS-1$ + addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_PA_RISC, String.valueOf(ch, start, length)); //$NON-NLS-1$ break; case STATE_ARCH_SPARC : - addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_SPARC, String.valueOf(ch, start, length).trim()); //$NON-NLS-1$ + addLaunchArgumentToMap(platformKeyPrefix + "." + EL_ARCH_SPARC, String.valueOf(ch, start, length)); //$NON-NLS-1$ break; case STATE_CONFIG_INI : if (platformConfigPath != null) @@ -967,7 +967,7 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { String oldValue = launcherArgs.getProperty(key); if (oldValue != null) - launcherArgs.setProperty(key, oldValue + " " + value); //$NON-NLS-1$ + launcherArgs.setProperty(key, oldValue + value); else launcherArgs.setProperty(key, value); } |