Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 6 insertions, 24 deletions

diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java
index 965b3c0de9bf..3c775f5b2e8c 100644
--- a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java
+++ b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java
@@ -21,7 +21,6 @@ package com.intellij.openapi.vfs.newvfs;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.io.DataInputOutputUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -60,33 +59,12 @@ public class FileAttribute {
 
   @Nullable
   public DataInputStream readAttribute(@NotNull VirtualFile file) {
-    DataInputStream stream = ManagingFS.getInstance().readAttribute(file, this);
-    if (stream != null) {
-      try {
-        int actualVersion = DataInputOutputUtil.readINT(stream);
-        if (actualVersion != myVersion) {
-          stream.close();
-          return null;
-        }
-      }
-      catch (IOException e) {
-        return null;
-      }
-    }
-    return stream;
+    return ManagingFS.getInstance().readAttribute(file, this);
   }
 
   @NotNull
   public DataOutputStream writeAttribute(@NotNull VirtualFile file) {
-    final DataOutputStream stream = ManagingFS.getInstance().writeAttribute(file, this);
-    try {
-      DataInputOutputUtil.writeINT(stream, myVersion);
-    }
-    catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-
-    return stream;
+    return ManagingFS.getInstance().writeAttribute(file, this);
   }
 
   @Nullable
@@ -131,4 +109,8 @@ public class FileAttribute {
   public FileAttribute newVersion(int newVersion) {
     return new FileAttribute(newVersion, myFixedSize, myId);
   }
+
+  public int getVersion() {
+    return myVersion;
+  }
 }