Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java	Tue Sep 16 14:15:47 2014 -0700
     1.2 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java	Wed Sep 17 15:02:42 2014 +0530
     1.3 @@ -125,6 +125,15 @@
     1.4  
     1.5          @Override
     1.6          public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) {
     1.7 +            if (sourceType == ConsString.class) {
     1.8 +                if (String.class == targetType1 || CharSequence.class == targetType1) {
     1.9 +                    return Comparison.TYPE_1_BETTER;
    1.10 +                }
    1.11 +
    1.12 +                if (String.class == targetType2 || CharSequence.class == targetType2) {
    1.13 +                    return Comparison.TYPE_2_BETTER;
    1.14 +                }
    1.15 +            }
    1.16              return linkerServices.compareConversion(sourceType, targetType1, targetType2);
    1.17          }
    1.18      }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8058615.js	Wed Sep 17 15:02:42 2014 +0530
     2.3 @@ -0,0 +1,36 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8058615: Overload resolution ambiguity involving ConsString
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +var strw = new java.io.StringWriter();
    2.35 +var bufw = new java.io.BufferedWriter(strw);
    2.36 +var s = "hello ";
    2.37 +bufw.write(s + "world");
    2.38 +bufw.close();
    2.39 +print(strw.toString());

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8058615.js.EXPECTED	Wed Sep 17 15:02:42 2014 +0530
     3.3 @@ -0,0 +1,1 @@
     3.4 +hello world