diff options
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java')
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java index 2d204eb..c13ab46 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java @@ -224,13 +224,6 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate { @SuppressWarnings("resource") // Closeables.closeQuietly public static void startTracing(Shell shell, TraceOptions traceOptions, int port) { - FileOutputStream fos = null; - try { - fos = new FileOutputStream(traceOptions.traceDestination, false); - } catch (FileNotFoundException e) { - // input path is valid, so this cannot occur - } - Socket socket = new Socket(); DataInputStream traceDataStream = null; DataOutputStream traceCommandsStream = null; @@ -243,7 +236,6 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate { MessageDialog.openError(shell, "OpenGL Trace", "Unable to connect to remote GL Trace Server: " + e.getMessage()); - Closeables.closeQuietly(fos); return; } @@ -258,10 +250,16 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate { "OpenGL Trace", "Unexpected error while setting trace options: " + e.getMessage()); closeSocket(socket); - Closeables.closeQuietly(fos); return; } + FileOutputStream fos = null; + try { + fos = new FileOutputStream(traceOptions.traceDestination, false); + } catch (FileNotFoundException e) { + // input path is valid, so this cannot occur + } + // create trace writer that writes to a trace file TraceFileWriter traceFileWriter = new TraceFileWriter(fos, traceDataStream); traceFileWriter.start(); |