Bug 351438 - performance problems with ExportedPackageImpl constructor

3 files changed, 8 insertions, 12 deletions

diff --git a/bundles/org.eclipse.osgi.tests/.cvsignore b/bundles/org.eclipse.osgi.tests/.gitignore
index e1951f862..e1951f862 100644
--- a/bundles/org.eclipse.osgi.tests/.cvsignore
+++ b/bundles/org.eclipse.osgi.tests/.gitignore
diff --git a/bundles/org.eclipse.osgi/.cvsignore b/bundles/org.eclipse.osgi/.gitignore
index 82e5cee02..82e5cee02 100644
--- a/bundles/org.eclipse.osgi/.cvsignore
+++ b/bundles/org.eclipse.osgi/.gitignore
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java
index f4482e0b1..a26998541 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ExportedPackageImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 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
@@ -19,20 +19,17 @@ import org.osgi.framework.*;
 import org.osgi.framework.Constants;
 import org.osgi.service.packageadmin.ExportedPackage;
 
+/**
+ * @deprecated
+ */
 public class ExportedPackageImpl implements ExportedPackage {
 
-	private final String specVersion;
 	private final ExportPackageDescription exportedPackage;
 	private final BundleLoaderProxy supplier;
 
 	public ExportedPackageImpl(ExportPackageDescription exportedPackage, BundleLoaderProxy supplier) {
 		this.exportedPackage = exportedPackage;
 		this.supplier = supplier;
-		Version version = exportedPackage.getVersion();
-		if (version != null)
-			this.specVersion = version.toString();
-		else
-			this.specVersion = null;
 	}
 
 	public String getName() {
@@ -78,7 +75,7 @@ public class ExportedPackageImpl implements ExportedPackage {
 	 * @deprecated
 	 */
 	public String getSpecificationVersion() {
-		return specVersion;
+		return exportedPackage.getVersion().toString();
 	}
 
 	public Version getVersion() {
@@ -94,10 +91,9 @@ public class ExportedPackageImpl implements ExportedPackage {
 
 	public String toString() {
 		StringBuffer result = new StringBuffer(getName());
-		if (specVersion != null) {
-			result.append("; ").append(Constants.VERSION_ATTRIBUTE); //$NON-NLS-1$
-			result.append("=\"").append(specVersion).append("\""); //$NON-NLS-1$//$NON-NLS-2$
-		}
+		result.append("; ").append(Constants.VERSION_ATTRIBUTE); //$NON-NLS-1$
+		result.append("=\"").append(exportedPackage.getVersion().toString()).append("\""); //$NON-NLS-1$//$NON-NLS-2$
+
 		return result.toString();
 	}
 }