summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalgorzata Janczarska2011-11-09 04:59:36 (EST)
committer Tomasz Zarna2011-11-09 04:59:36 (EST)
commitb86ec51911fee7d7a0d0481f7c191bbc49b1ed11 (patch)
tree6ac4791e8547873a88d352db51800cfc8a7966b6
parent77e191005304a575da09fac8c7f2eb01ed8e4ed6 (diff)
downloadeclipse.platform.team-b86ec51911fee7d7a0d0481f7c191bbc49b1ed11.zip
eclipse.platform.team-b86ec51911fee7d7a0d0481f7c191bbc49b1ed11.tar.gz
eclipse.platform.team-b86ec51911fee7d7a0d0481f7c191bbc49b1ed11.tar.bz2
bug 363158: [Backport] NPE getting module children when not retrieved by
deferred
-rw-r--r--bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
index d73ec94..b005034 100644
--- a/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true
-Bundle-Version: 3.3.400.qualifier
+Bundle-Version: 3.3.401.qualifier
Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java
index 91b6d0f..cc414ab 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 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
@@ -334,6 +334,7 @@ public class RepositoryRoot extends PlatformObject {
* Fetches tags from auto-refresh files.
*/
public CVSTag[] refreshDefinedTags(ICVSFolder folder, boolean recurse, IProgressMonitor monitor) throws TeamException {
+ monitor = Policy.monitorFor(monitor);
monitor.beginTask(null, 100);
CVSTag[] tags = null;
if (!recurse && !folder.getFolderSyncInfo().isVirtualDirectory()) {