From b99c87a98d478f03b2acab884cbe2c43b59270cd Mon Sep 17 00:00:00 2001
From: hoenicke <hoenicke@379699f6-c40d-0410-875b-85095c16579e>
Date: Mon, 3 Jul 2000 15:34:03 +0000
Subject: [PATCH] mergeModifiers: Merge the right modifiers for innerclasses
 attributes.

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1250 379699f6-c40d-0410-875b-85095c16579e
---
 jode/jode/bytecode/ClassInfo.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jode/jode/bytecode/ClassInfo.java b/jode/jode/bytecode/ClassInfo.java
index 95ec702..ebeb7e5 100644
--- a/jode/jode/bytecode/ClassInfo.java
+++ b/jode/jode/bytecode/ClassInfo.java
@@ -387,13 +387,13 @@ public final class ClassInfo extends BinaryInfo implements Comparable {
 	
 	int oldSimple = javaModifiersToBytecode(modifiers);
 	if (((oldSimple ^ newModifiers) & ~0x20) == 0) {
-	    modifiers = newModifiers | (modifiers & 0x20);
+	    modifiers |= newModifiers & 0x20;
 	    return;
 	}
 
 	int newSimple = javaModifiersToBytecode(newModifiers);
 	if (((newSimple ^ modifiers) & ~0x20) == 0) {
-	    modifiers |= newModifiers & 0x20;
+	    modifiers = newModifiers | (modifiers & 0x20);
 	    return;
 	}