Fix javascript property access to Character field via Setter

rhino/src/main/java/org/mozilla/javascript/NativeJavaObject.java

@@ -340,10 +340,10 @@ static int getConversionWeight(Object fromObj, TypeInfo to) {
                     return 1;
                 } else if (to.isInstance(fromObj)) {
                     return 2;
+                } else if (to.isCharacter()) {
+                    return 3;
                 } else if (to.isPrimitive()) {
-                    if (to.isCharacter()) {
-                        return 3;
-                    } else if (!to.isBoolean()) {
+                    if (!to.isBoolean()) {
                         return 4;
                     }
                 }

tests/src/test/java/org/mozilla/javascript/tests/type_info/GenericAccessTest.java

@@ -186,6 +186,27 @@ public void testIntLongMap() {
         expect(js, "Integer 4 Long 2 Long 2");
     }
 
+    @Test
+    public void testCharacters() {
+        String js = "bean.primitiveChar = 'a';\nbean.primitiveChar";
+        FieldBasedBean fieldBasedBean = new FieldBasedBean();
+        MethodBasedBean methodBasedBean = new MethodBasedBean();
+        expect(js, "97", Map.of("bean", fieldBasedBean));
+        Assertions.assertEquals('a', fieldBasedBean.primitiveChar);
+        expect(js, "97", Map.of("bean", methodBasedBean));
+        Assertions.assertEquals('a', methodBasedBean.getPrimitiveChar());
+
+        js = "bean.complexChar = 'b';\nbean.complexChar";
+        expect(js, "b", Map.of("bean", fieldBasedBean));
+        Assertions.assertEquals('b', fieldBasedBean.complexChar);
+        expect(js, "b", Map.of("bean", methodBasedBean));
+        Assertions.assertEquals('b', methodBasedBean.getComplexChar());
+
+        js = "bean.setComplexChar('c');\nbean.complexChar";
+        expect(js, "c", Map.of("bean", methodBasedBean));
+        Assertions.assertEquals('c', methodBasedBean.getComplexChar());
+    }
+
     private static void expect(String script, String expected) {
         var bindings = new HashMap<String, Object>();
         bindings.put("intList", IntegerArrayList.createTestObject());

tests/src/test/java/org/mozilla/javascript/tests/type_info/test_object/FieldBasedBean.java

@@ -15,6 +15,9 @@
 public class FieldBasedBean implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    public char primitiveChar = 0;
+    public Character complexChar = null;
+
     public List<Integer> integers = new ArrayList<>();
     private List<Double> doubles = new ArrayList<>();
 

tests/src/test/java/org/mozilla/javascript/tests/type_info/test_object/MethodBasedBean.java

@@ -15,6 +15,9 @@
 public class MethodBasedBean implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private char primitiveChar = 0;
+    private Character complexChar = null;
+
     private List<Integer> integers = new ArrayList<>();
     private List<Double> doubles = new ArrayList<>();
     private List<Number> numbers = new ArrayList<>();
@@ -29,6 +32,22 @@ public class MethodBasedBean implements Serializable {
     private GenericBean<Integer> intBean2 = new IntegerGenericBean();
     private GenericBean<Double> dblBean2 = new DoubleGenericBean();
 
+    public char getPrimitiveChar() {
+        return primitiveChar;
+    }
+
+    public void setPrimitiveChar(char primitiveChar) {
+        this.primitiveChar = primitiveChar;
+    }
+
+    public Character getComplexChar() {
+        return complexChar;
+    }
+
+    public void setComplexChar(Character complexChar) {
+        this.complexChar = complexChar;
+    }
+
     public List<Double> getDoubles() {
         return doubles;
     }