updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / util / TypeUtil.java

diff --git a/lib/jetty/org/eclipse/jetty/util/TypeUtil.java b/lib/jetty/org/eclipse/jetty/util/TypeUtil.java
index b96a520c110e413329e7b811f889b46a838a07db..b71e29e8adf076a03b61d53517dbb7d46f210786 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/util/TypeUtil.java
+++ b/lib/jetty/org/eclipse/jetty/util/TypeUtil.java
@@ -1,6 +1,6 @@
 //
 //  ========================================================================
 //
 //  ========================================================================

-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.

 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0


@@ -569,8 +569,9 @@ public class TypeUtil
                 
                 // target has no annotations
                 if ( parameterAnnotations == null || parameterAnnotations.length == 0 )
                 
                 // target has no annotations
                 if ( parameterAnnotations == null || parameterAnnotations.length == 0 )

-                {                
-                    LOG.debug("Target has no parameter annotations");                   
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("Target has no parameter annotations");

                     return constructor.newInstance(arguments);
                 }
                 else
                     return constructor.newInstance(arguments);
                 }
                 else


@@ -588,19 +589,22 @@ public class TypeUtil
                                
                                if (namedArgMap.containsKey(param.value()))
                                {
                                
                                if (namedArgMap.containsKey(param.value()))
                                {

-                                   LOG.debug("placing named {} in position {}", param.value(), count);
+                                   if (LOG.isDebugEnabled())
+                                       LOG.debug("placing named {} in position {}", param.value(), count);

                                    swizzled[count] = namedArgMap.get(param.value());
                                }
                                else
                                {
                                    swizzled[count] = namedArgMap.get(param.value());
                                }
                                else
                                {

-                                   LOG.debug("placing {} in position {}", arguments[count], count);
+                                   if (LOG.isDebugEnabled())
+                                       LOG.debug("placing {} in position {}", arguments[count], count);

                                    swizzled[count] = arguments[count];
                                }
                                ++count;
                            }
                            else
                            {
                                    swizzled[count] = arguments[count];
                                }
                                ++count;
                            }
                            else
                            {

-                               LOG.debug("passing on annotation {}", annotation);
+                               if (LOG.isDebugEnabled())
+                                   LOG.debug("passing on annotation {}", annotation);

                            }
                        }
                    }
                            }
                        }
                    }