# HG changeset patch # User timkelly # Date 1265828421 21600 # Node ID c6a84ca946e6a1a5e942bcfd1089a0d1af3319e5 # Parent 8995c5d356235dd975a9cd2dd84e8ac42c400b41 Timout SBSv2 version check if sbs hangs (bug 10467) diff -r 8995c5d35623 -r c6a84ca946e6 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Wed Feb 10 11:48:54 2010 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Wed Feb 10 13:00:21 2010 -0600 @@ -654,8 +654,23 @@ String overallOutput = null; String stdErrLine = null; try { - while ((stdErrLine = br.readLine()) != null) { - overallOutput += stdErrLine; + + // Only try for 10 seconds then bail in case Raptor hangs + int maxTries = 20; + int numTries = 0; + while (numTries < maxTries) { + try { + Thread.sleep(500); + } catch (InterruptedException e) { + // ignore + } + if (br.ready()) { + while ((stdErrLine = br.readLine()) != null) { + overallOutput += stdErrLine; + } + break; + } + numTries++; } } catch (IOException e) { e.printStackTrace();