summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormihaylov <mihaylov@epfl.ch>2006-06-20 16:23:40 +0000
committermihaylov <mihaylov@epfl.ch>2006-06-20 16:23:40 +0000
commita4e074308b7f9a739101d913302dbb7a7126a24a (patch)
tree1b99303a6e4ad8601b89fd12ba4b8a0aa643b181
parent913b2c9b3a887fb9c1cecff1e2d699af29f312ab (diff)
downloadscala-a4e074308b7f9a739101d913302dbb7a7126a24a.tar.gz
scala-a4e074308b7f9a739101d913302dbb7a7126a24a.tar.bz2
scala-a4e074308b7f9a739101d913302dbb7a7126a24a.zip
Fixed bug #634
-rw-r--r--lib/fjbg.jar.desired.sha12
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/fjbg.jar.desired.sha1 b/lib/fjbg.jar.desired.sha1
index 872a94f9b0..cb6e38726d 100644
--- a/lib/fjbg.jar.desired.sha1
+++ b/lib/fjbg.jar.desired.sha1
@@ -1 +1 @@
-6c45acb11cf51afe1d734eea4ccd9d55cf41d271 ?fjbg.jar
+3f279fef71e48b40092b68f5154392fceb10b351 ?fjbg.jar
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 69a008679d..8e67f7381d 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -338,7 +338,7 @@ abstract class GenJVM extends SubComponent {
if (m.symbol.hasFlag(Flags.BRIDGE))
jmethod.addAttribute(fjbgContext.JOtherAttribute(jclass, jmethod, "Bridge",
new Array[Byte](0)));
- if (remoteClass || (m.symbol.attributes contains Pair(RemoteAttr, Nil)))
+ if (remoteClass || (m.symbol.attributes contains Triple(RemoteAttr, Nil, Nil)))
if (jmethod.isPublic()) {
// (see http://java.sun.com/docs/books/vmspec/html/ClassFile.doc.html#3129)
// Exceptions_attribute {