Merge branch 'master' of https://github.com/raydac/java-comment-preprocessor

Conflicts:
	src/main/java/com/igormaznitsa/jcp/context/PreprocessingState.java
added extra debug info about ignored file content

Author: raydac

src/main/java/com/igormaznitsa/jcp/context/PreprocessingState.java

@@ -404,16 +404,24 @@ public boolean saveBuffersToFile(final File outFile, final boolean removeComment
           content = ((StringWriter)new JavaCommentsRemover(new StringReader(content), new StringWriter(totatBufferedChars)).process()).toString();
         }
 
-        if (outFile.isFile()){
-          final byte [] contentInBinaryForm = content.getBytes(globalOutCharacterEncoding);
-          final InputStream currentFileInputStream = new BufferedInputStream(new FileInputStream(outFile),Math.max(16384, (int)outFile.length()));
-          
-          if (!IOUtils.contentEquals(currentFileInputStream,new ByteArrayInputStream(contentInBinaryForm))){
-            currentFileInputStream.close();
-            FileUtils.writeByteArrayToFile(outFile, contentInBinaryForm, false);
-            wasSaved = true;
+        boolean needWrite = true; // better write than not
+        final byte [] contentInBinaryForm = content.getBytes(globalOutCharacterEncoding);
+        if (outFile.isFile() && outFile.length() == contentInBinaryForm.length) {
+          // If file exists and has the same content, then skip overwriting it
+          InputStream currentFileInputStream = null;
+          try {
+            currentFileInputStream = new BufferedInputStream(new FileInputStream(outFile),Math.max(16384, (int)outFile.length()));
+            needWrite = !IOUtils.contentEquals(currentFileInputStream,new ByteArrayInputStream(contentInBinaryForm));
+          } finally {
+            IOUtils.closeQuietly(currentFileInputStream);
           }
         }
+        if (needWrite) {
+          FileUtils.writeByteArrayToFile(outFile, contentInBinaryForm, false);
+          wasSaved = true;
+        } else {
+          this.context.logDebug("Ignore writing data for "+outFile+" because its content has not been changed");
+        }
       }else{
         if (removeComments) {
           final String joinedBufferContent = ((StringWriter) writePrinterBuffers(new StringWriter(totatBufferedChars))).toString();

src/main/java/com/igormaznitsa/jcp/context/PreprocessorContext.java

@@ -184,12 +184,9 @@ public void registerSpecialVariableProcessor(final SpecialVariableProcessor proc
    * @param text a String to be printed into the information log, it can be null
    */
   public void logInfo(final String text) {
-
-    if (text == null || preprocessorLogger == null) {
-      return;
+    if (text != null && this.preprocessorLogger != null) {
+      this.preprocessorLogger.info(text);
     }
-
-    preprocessorLogger.info(text);
   }
 
   /**
@@ -198,22 +195,32 @@ public void logInfo(final String text) {
    * @param text a String to be printed into the error log, it can be null
    */
   public void logError(final String text) {
-    if (text == null || preprocessorLogger == null) {
-      return;
+    if (text != null && this.preprocessorLogger != null) {
+      this.preprocessorLogger.error(text);
     }
-    preprocessorLogger.error(text);
   }
 
+  /**
+   * Print some debug info into the current log
+   *
+   * @param text a String to be printed into the error log, it can be null
+   * @since 6.0.1
+   */
+  public void logDebug(final String text){
+    if (text != null && this.preprocessorLogger != null) {
+      this.preprocessorLogger.debug(text);
+    }
+  }
+  
   /**
    * Print an information about a warning situation into the current log
    *
    * @param text a String to be printed into the warning log, it can be null
    */
   public void logWarning(final String text) {
-    if (text == null || preprocessorLogger == null) {
-      return;
+    if (text != null || this.preprocessorLogger != null) {
+      this.preprocessorLogger.warning(text);
     }
-    preprocessorLogger.warning(text);
   }
 
   /**

src/main/java/com/igormaznitsa/jcp/logger/PreprocessorLogger.java

@@ -40,6 +40,7 @@ public interface PreprocessorLogger {
    * Log a debug message
    *
    * @param message the text to be output into the information log
+   * @since 6.0.1
    */
   void debug(String message);