Issue #773. scala 2.7.7 friendly

lift · Dec 13, 2010 · c3dc36e · c3dc36e
1 parent 04f9386
commit c3dc36e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/framework/lift-persistence/lift-record/src/main/scala/net/liftweb/record/MetaRecord.scala b/framework/lift-persistence/lift-record/src/main/scala/net/liftweb/record/MetaRecord.scala
@@ -126,7 +126,7 @@ trait MetaRecord[BaseRecord <: Record[BaseRecord]] {
 
     fieldList = {
       val ordered = fieldOrder.flatMap(f => tArray.find(_.metaField == f))
-      ordered ++ (tArray -- ordered)
+      ordered ++ (tArray.toList -- ordered)
     }
 
     fieldMap = Map() ++ fieldList.map(i => (i.name, i))

diff --git a/framework/lift-persistence/lift-record/src/test/scala/net/liftweb/record/RecordSpecs.scala b/framework/lift-persistence/lift-record/src/test/scala/net/liftweb/record/RecordSpecs.scala
@@ -307,6 +307,7 @@ object RecordSpecs extends Specification {
   "basic record" should {
     "order fields according to fieldOrder" in {
       BasicTestRecord.metaFields must_==  List(BasicTestRecord.field2, BasicTestRecord.field1, BasicTestRecord.field3)
+      ()
     }
   }
 }