Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x c75fd77ad -> 5ffde6c66


Fixed JSONObject not to use multicatch because of jdk 6 level

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5ffde6c6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5ffde6c6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5ffde6c6

Branch: refs/heads/wicket-6.x
Commit: 5ffde6c66ca5ea0023d41bf63703bfdfdc1c529e
Parents: c75fd77
Author: Tobias Soloschenko <[email protected]>
Authored: Sun Jan 15 14:55:59 2017 +0100
Committer: Tobias Soloschenko <[email protected]>
Committed: Sun Jan 15 14:55:59 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/wicket/ajax/json/JSONObject.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/5ffde6c6/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java 
b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
index 08b2bc0..b208946 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
@@ -231,8 +231,12 @@ public class JSONObject {
                    PropertyDescriptor propertyDescriptor = properties[i];
                    props.put(propertyDescriptor.getDisplayName(), 
propertyDescriptor.getReadMethod().invoke(bean));
                }
-       }catch(IntrospectionException | InvocationTargetException | 
IllegalAccessException e){
+       }catch( IllegalAccessException e){
                throw new JSONException(e);
+       }catch(IntrospectionException e){
+               throw new JSONException(e);
+       }catch(InvocationTargetException e){
+               throw new JSONException(e);             
        }
         return props;
     }

Reply via email to