8243665: exploded-image-optimize touches module-info.class in all modules

magicus · magicus · commit 5bbee05c7a64 · 2020-04-29T13:01:40.000+02:00
Reviewed-by: alanb
diff --git a/make/jdk/src/classes/build/tools/jigsaw/AddPackagesAttribute.java b/make/jdk/src/classes/build/tools/jigsaw/AddPackagesAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;
 
@@ -83,7 +84,10 @@ static void addPackagesAttribute(Path mi, Set<String> packages) throws IOExcepti
             bytes = baos.toByteArray();
         }
 
-        Files.write(mi, bytes);
+        byte[] currentBytes = Files.readAllBytes(mi);
+        if (!Arrays.equals(bytes, currentBytes)) {
+            Files.write(mi, bytes);
+        }
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -34,6 +34,7 @@`
`34`	`34`	`import java.nio.file.Files;`
`35`	`35`	`import java.nio.file.Path;`
`36`	`36`	`import java.nio.file.Paths;`
	`37`	`+import java.util.Arrays;`
`37`	`38`	`import java.util.Optional;`
`38`	`39`	`import java.util.Set;`
`39`	`40`
`@@ -83,7 +84,10 @@ static void addPackagesAttribute(Path mi, Set<String> packages) throws IOExcepti`
`83`	`84`	`bytes = baos.toByteArray();`
`84`	`85`	`}`
`85`	`86`
`86`		`- Files.write(mi, bytes);`
	`87`	`+ byte[] currentBytes = Files.readAllBytes(mi);`
	`88`	`+ if (!Arrays.equals(bytes, currentBytes)) {`
	`89`	`+ Files.write(mi, bytes);`
	`90`	`+ }`
`87`	`91`	`}`
`88`	`92`
`89`	`93`	`}`