Bug 141288 nullpointer in StateWriter class

1 files changed, 12 insertions, 10 deletions

diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateWriter.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateWriter.java
index 8cd2bad9c..eec6e7dc6 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateWriter.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateWriter.java
@@ -123,29 +123,31 @@ class StateWriter {
 			outState.writeBoolean(state.isResolved());
 			state.setDynamicCacheChanged(false);
 		} finally {
-			if (outLazy != null)
+			if (outLazy != null) {
 				try {
 					outLazy.flush();
 					fosLazy.getFD().sync();
 				} catch (IOException e) {
 					// do nothing, we tried
 				}
-			try {
-				outLazy.close();
-			} catch (IOException e) {
-				// do nothing
+				try {
+					outLazy.close();
+				} catch (IOException e) {
+					// do nothing
+				}
 			}
-			if (outState != null)
+			if (outState != null) {
 				try {
 					outState.flush();
 					fosState.getFD().sync();
 				} catch (IOException e) {
 					// do nothing, we tried
 				}
-			try {
-				outState.close();
-			} catch (IOException e) {
-				// do nothing
+				try {
+					outState.close();
+				} catch (IOException e) {
+					// do nothing
+				}
 			}
 		}
 	}