Attachment #59298 for bug #173893

Lines 1-5 Link Here

(-)src/org/eclipse/update/internal/core/connection/ConnectionThreadManager.java (-7 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* James D Miles (IBM Corp.) - bug 173893, AbstractResponse.openStreamWithCanel pegs CPU
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.update.internal.core.connection;	12	package org.eclipse.update.internal.core.connection;
12		13
Lines 94-99 Link Here
94	public void run() {	95	public void run() {
95	try {	96	try {
96	is = urlConnection.getInputStream();	97	is = urlConnection.getInputStream();
		98	} catch (IOException e) {
		99	ioException = e;
		100	} catch (Exception e) {
		101	exception = e;
		102	} finally {
97	if (disconnected) {	103	if (disconnected) {
98	// The connection was slow, but returned	104	// The connection was slow, but returned
99	// a valid input stream. However,	105	// a valid input stream. However,
Lines 110-121 Link Here
110	}	116	}
111	}	117	}
112	}	118	}
113	} catch (IOException e) {
114	ioException = e;
115	} catch (Exception e) {
116	exception = e;
117	} finally {
118	//threads.
119	}	119	}
120	}	120	}
121	}	121	}




/*******************************************************************************
 * Copyright (c) 2000, 2007 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

 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     James D Miles (IBM Corp.) - bug 173893, AbstractResponse.openStreamWithCanel pegs CPU
 *******************************************************************************/

package org.eclipse.update.internal.core.connection;

				if (monitor.isCanceled()) {
					runnable.disconnect();
	                connection = null;
	                //break;
				}
				if (runnable.getInputStream() != null) {
					is = runnable.getInputStream();
					break;
				}
				if (runnable.getIOException() != null) 
					throw runnable.getIOException();

															IStatus.OK,
															runnable.getException().getMessage(), 
															runnable.getException()));
				if (runnable.getInputStream() != null || !t.isAlive()) {
					is = runnable.getInputStream();
					break;
				}
				t.join(POLLING_INTERVAL);
			}
		} catch (InterruptedException e) {
		}
		return is;

Return to bug 173893