src/share/classes/java/util/Properties.java

rev 7508 : imported patch 6609431

*** 1,7 ****
  /*
!  * Copyright (c) 1995, 2012, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1995, 2013, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 441,450 ****
--- 441,453 ----
                      inOff = 0;
                      if (inLimit <= 0) {
                          if (len == 0 || isCommentLine) {
                              return -1;
                          }
+                         if (precedingBackslash) {
+                             len--;
+                         }
                          return len;
                      }
                  }
                  if (inStream != null) {
                      //The line below is equivalent to calling a
*** 508,517 ****
--- 511,523 ----
                          inLimit = (inStream==null)
                                    ?reader.read(inCharBuf)
                                    :inStream.read(inByteBuf);
                          inOff = 0;
                          if (inLimit <= 0) {
+                             if (precedingBackslash) {
+                                 len--;
+                             }
                              return len;
                          }
                      }
                      if (precedingBackslash) {
                          len -= 1;