Attachment 178543 Details for Bug 324850 – ConsoleSession patch

[patch] ConsoleSession patch

324850.txt (text/plain), 2.05 KB, created by Thomas Watson

on 2010-09-09 14:26:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Watson

Created: 2010-09-09 14:26:50 EDT

Size: 2.05 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.osgi
>Index: core/framework/org/eclipse/osgi/framework/console/ConsoleSession.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/console/ConsoleSession.java,v
>retrieving revision 1.5
>diff -u -r1.5 ConsoleSession.java
>--- core/framework/org/eclipse/osgi/framework/console/ConsoleSession.java	8 Sep 2010 18:19:31 -0000	1.5
>+++ core/framework/org/eclipse/osgi/framework/console/ConsoleSession.java	9 Sep 2010 18:24:56 -0000
>@@ -28,8 +28,8 @@
>  * </p>
>  * @since 3.6
>  */
>-public abstract class ConsoleSession implements ServiceFactory<ConsoleSession> {
>-	private volatile ServiceRegistration<ConsoleSession> sessionRegistration;
>+public abstract class ConsoleSession implements ServiceFactory<Object> {
>+	private volatile ServiceRegistration<Object> sessionRegistration;
> 
> 	/**
> 	 * Called by the console implementation to free resources associated
>@@ -39,7 +39,7 @@
> 	 */
> 	public final void close() {
> 		doClose();
>-		ServiceRegistration<ConsoleSession> current = sessionRegistration;
>+		ServiceRegistration<Object> current = sessionRegistration;
> 		if (current != null) {
> 			sessionRegistration = null;
> 			try {
>@@ -78,9 +78,8 @@
> 
> 	/**
> 	 * @noreference This method is not intended to be referenced by clients.
>-	 * @since 3.7
> 	 */
>-	public final ConsoleSession getService(Bundle bundle, ServiceRegistration<ConsoleSession> registration) {
>+	public final Object getService(Bundle bundle, ServiceRegistration<Object> registration) {
> 		if (sessionRegistration == null)
> 			sessionRegistration = registration;
> 		return this;
>@@ -88,9 +87,8 @@
> 
> 	/**
> 	 * @noreference This method is not intended to be referenced by clients.
>-	 * @since 3.7
> 	 */
>-	public final void ungetService(Bundle bundle, ServiceRegistration<ConsoleSession> registration, ConsoleSession service) {
>+	public final void ungetService(Bundle bundle, ServiceRegistration<Object> registration, Object service) {
> 		// do nothing
> 	}
>

Actions: View | Diff

Attachments on bug 324850: 178519 | 178526 | 178543 | 179022 | 179624 | 179799 | 179821