Mercurial > hg > truffle

changeset 19506:8c7536965c95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 19 Feb 2015 15:44:05 +0100
parents 068256ee3b90 (diff) 95aa11d4822d (current diff)
children 1cde96b96673 387f86ea4d10
files graal/com.oracle.graal.java/src/com/oracle/graal/java/GraalDirectivePlugins.java graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java	Thu Feb 19 13:25:23 2015 +0100
+++ b/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java	Thu Feb 19 15:44:05 2015 +0100
@@ -275,8 +275,7 @@
      */
     @Override
     @TruffleBoundary
-    public final Property getProperty(Object key) {
-        // return this.propertyMap.get(propertyName);
+    public Property getProperty(Object key) {
         PropertyMap current = this.propertyMap;
         while (current.getLastProperty() != null) {
             if (current.getLastProperty().getKey().equals(key)) {
@@ -284,7 +283,6 @@
             }
             current = current.getParentMap();
         }
-
         return null;
     }