Index: GroupRenderer.java
===================================================================
--- GroupRenderer.java	(revision 15962)
+++ GroupRenderer.java	(working copy)
@@ -267,16 +267,7 @@
                 String targetID = getParamamterValue((String[]) requestMap
                         .get(getHiddenFieldName(context, component, DROP)));
 
-                Object targetDragValue = null;
-                Object targetDropValue = null;
 
-                if (targetID != null && targetID.length() > 0) {
-                    DnDCache dndCache = DnDCache.getInstance(context, false);
-                    targetDragValue = dndCache.getDragValue(panel.getClientId(context));
-                    targetDropValue = dndCache.getDropValue(targetID);
-
-                }
-
                 if (log.isTraceEnabled()) {
                     log.trace("Dnd Event Client ID [" +
                               component.getClientId(context) + "] Target ID [" +
@@ -303,7 +294,16 @@
 
                 MethodBinding listener = panel.getDragListener();
                 if (listener != null) {
+					Object targetDragValue = null;
+					Object targetDropValue = null;
 
+					if (targetID != null && targetID.length() > 0) {
+						DnDCache dndCache = DnDCache.getInstance(context, false);
+						targetDragValue = dndCache.getDragValue(panel.getClientId(context));
+						targetDropValue = dndCache.getDropValue(targetID);
+
+					}
+
                     DragEvent event = new DragEvent(component, type, targetID,
                                                     targetDragValue,
                                                     targetDropValue);
@@ -311,10 +311,19 @@
                 }
                 listener = panel.getDropListener();
                 if (listener != null) {
+					Object targetDragValue = null;
+					Object targetDropValue = null;
 
+					if (targetID != null && targetID.length() > 0) {
+						DnDCache dndCache = DnDCache.getInstance(context, false);
+						targetDragValue = dndCache.getDragValue(targetID);
+						targetDropValue = dndCache.getDropValue(panel.getClientId(context));
+
+					}
+
                     DropEvent event = new DropEvent(component, type, targetID,
-                                                    targetDropValue,
-                                                    targetDragValue);
+                                                    targetDragpValue,
+                                                    targetDropValue);
                     panel.queueEvent(event);
                 }
             }