010-10-18 Jeff Johnston <jjohnstn@redhat.com>

	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java (getHoverInfo): Don't
	print out stack trace for a time-out exception.  Set read time-out to be 5 seconds.

2 files changed, 8 insertions, 2 deletions

diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/ChangeLog b/libhover/org.eclipse.linuxtools.cdt.libhover/ChangeLog
index 9a9cca0dba..b001c68e80 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover/ChangeLog
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/ChangeLog
@@ -1,7 +1,7 @@
 2010-10-18  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java (getHoverInfo): Don't
-	print out stack trace for a time-out exception.
+	print out stack trace for a time-out exception.  Set read time-out to be 5 seconds.
 
 2010-03-17  Jeff Johnston  <jjohnstn@redhat.com>
 
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
index 931553f290..e43d80efe0 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
@@ -16,9 +16,11 @@ import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.net.ConnectException;
 import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 
 import org.eclipse.core.filesystem.URIUtil;
@@ -99,7 +101,9 @@ public class LibHoverLibrary {
 				InputStream docStream = null;
 				if (p == null) {
 					URL url = acDoc.toURL();
-					docStream = url.openStream();
+					URLConnection c = url.openConnection();
+					c.setReadTimeout(5000); // pick a timeout value less than 15s (default)
+					docStream = c.getInputStream();
 				} else {
 					try {
 						// Try to open the file as local to this plug-in.
@@ -120,6 +124,8 @@ public class LibHoverLibrary {
 				e.printStackTrace();
 			} catch (ConnectException e) {
 				// Do nothing..time-out exception
+			} catch (SocketTimeoutException e) {
+				// Do nothing..time-out exception
 			} catch (IOException e) {
 				e.printStackTrace();
 			} catch (ClassNotFoundException e) {