[fractal-commits] [8330] trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/ fractal/adl/comments/CommentDecoration.java:Fix bug in CommentDecoration class.

[matthieu.leclercq@xxxxxx]

Title: [8330] trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/comments/CommentDecoration.java: Fix bug in CommentDecoration class.

Revision

8330

Author

leclercq

Date

2008-07-29 10:28:43 +0200 (Tue, 29 Jul 2008)

Log Message

Fix bug in CommentDecoration class.

Modified Paths

• trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/comments/CommentDecoration.java

Diff

Modified: trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/comments/CommentDecoration.java (8329 => 8330)

--- trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/comments/CommentDecoration.java	2008-07-27 08:09:22 UTC (rev 8329)
+++ trunk/fractaladl/toolchain/ast-core/src/main/java/org/objectweb/fractal/adl/comments/CommentDecoration.java	2008-07-29 08:28:43 UTC (rev 8330)
@@ -81,7 +81,7 @@
   public Object mergeDecoration(final Object overridingDecoration)
       throws MergeException {
     if (!(overridingDecoration instanceof CommentDecoration)) {
-      return overridingDecoration;
+      return this;
     }
     final CommentDecoration overridingComment = (CommentDecoration) overridingDecoration;
     if (overridingComment.overriddenComment == null)