From 7a4cc63c287089ec2bcd2cb49c51538a747ca0e3 Mon Sep 17 00:00:00 2001
From: robekras <robekras>
Date: Mon, 7 Mar 2011 17:44:00 +0000
Subject: [PATCH] 1) CLASSNAME is specified by the property 'name' == CLASSNAME. When doing it by the property 'encoding', we will lose all variables which have the encoding base64 (which is true for string variables).

---
 .../xdebug/php/model/XDebugObjectValue.java        |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java
index 92ba352..a94b869 100644
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java
@@ -18,31 +18,32 @@ public class XDebugObjectValue extends XDebugAbstractValue {
 		NumChildren = 0;
 		if (!PHPDebugUtils.getAttributeValue(value, "numchildren").equals("")) {
 			NumChildren = Integer.parseInt(PHPDebugUtils.getAttributeValue(value, "numchildren"));
-		}		
+		}
 
 		if (NumChildren > 0) {
 			NodeList property = value.getChildNodes();
-			
+
 			ArrayList a = new ArrayList();
 			for (int i = 0; i < property.getLength(); i++) {
 				Node propertyNode = property.item(i);
-				/* 
+				/*
 				 * Eliminate CLASSNAME duplicate from object properties.
 				 * see http://bugs.xdebug.org/view.php?id=518
 				 * and http://svn.xdebug.org/cgi-bin/viewvc.cgi/xdebug/trunk/xdebug_var.c?root=xdebug&r1=2962&r2=2996
 				 */
-				String encoding = PHPDebugUtils.getAttributeValue(propertyNode, "encoding");
-				if (encoding.equals("base64")) {
+				String name     = PHPDebugUtils.getAttributeValue (propertyNode, "name");
+
+				if (!name.equals ("CLASSNAME")) {
 					a.add(new XDebugVariable(variable, propertyNode));
 				}
 			}
-			
+
 			setChildren((IVariable[])a.toArray(new IVariable[a.size()]));
 		}
-		
+
 		String className = PHPDebugUtils.getAttributeValue(value,"classname");
 		if(!"".equals(className)) {
 			setValueString(className);
 		}
 	}
-}
\ No newline at end of file
+}
-- 
1.7.1