diff options
author | DJ Houghton | 2011-06-08 14:00:39 +0000 |
---|---|---|
committer | DJ Houghton | 2011-06-08 14:00:39 +0000 |
commit | 6c140220c9f2c024e80e59af542d6d63c1a8254a (patch) | |
tree | 31c9f21426788a47cfb1224874539eb38e35167d | |
parent | d24435474b7aa9d3ea9873c86b75bf91d1b7d884 (diff) | |
download | rt.equinox.p2-6c140220c9f2c024e80e59af542d6d63c1a8254a.tar.gz rt.equinox.p2-6c140220c9f2c024e80e59af542d6d63c1a8254a.tar.xz rt.equinox.p2-6c140220c9f2c024e80e59af542d6d63c1a8254a.zip |
Bug 348712 - Test failures in nightly build
2 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF index bac57f564..b3489952f 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.eclipse;singleton:=true -Bundle-Version: 2.1.0.qualifier +Bundle-Version: 2.1.100.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.eclipse.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java index 2ded7cfa3..8f3c4d81e 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/RepositoryAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 IBM Corporation and others. + * Copyright (c) 2008, 2011 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 @@ -169,9 +169,10 @@ abstract class RepositoryAction extends ProvisioningAction { IRepositoryManager<?> manager = getRepositoryManager(agent, event.getRepositoryType()); Preferences node = getRepositoryPreferenceNode(agentLocation, null, event.getRepositoryLocation(), event.getRepositoryType()); int count = getRepositoryCount(node); + // modify the repository count before (potentially) removing the preference node + setRepositoryCount(node, count); if (--count < 1 && manager != null) manager.removeRepository(event.getRepositoryLocation()); - setRepositoryCount(node, count); } /** |