Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix implicit resolution for JavaConversions to work for 2.8.x and 2.9.x

  • Loading branch information...
commit 71f655893feb63646b8884753d0889f2a4891453 1 parent 3c4177f
@indrajitr indrajitr authored
View
8 core/util/src/main/scala/net/liftweb/util/ListHelpers.scala
@@ -102,7 +102,7 @@ trait ListHelpers {
}
loop(old.toList, newList.toList)
-
+
ret.toList
}
@@ -167,8 +167,10 @@ trait ListHelpers {
/**
* Convert a java.util.Enumeration to a List[T]
*/
- def enumToList[T](enum: java.util.Enumeration[T]): List[T] =
- scala.collection.JavaConversions.enumerationAsScalaIterator(enum).toList
+ def enumToList[T](enum: java.util.Enumeration[T]): List[T] = {
+ import scala.collection.JavaConversions._
+ enum.toList
+ }
/**
* Convert a java.util.Enumeration to a List[String] using the toString method on each element
View
3  web/testkit/src/main/scala/net/liftweb/mocks/MockHttpServletRequest.scala
@@ -425,7 +425,8 @@ class MockHttpServletRequest(val url : String = null, var contextPath : String =
case (k,v) => newMap += k -> (newMap(k) ::: v :: Nil) // Ugly, but it works and keeps order
}
- asJavaMap(newMap.map{case (k,v) => (k,v.toArray)}.asInstanceOf[Map[Object,Object]])
+ newMap.map{case (k,v) => (k,v.toArray)}.asInstanceOf[Map[Object,Object]]
+// asMap(newMap.map{case (k,v) => (k,v.toArray)}.asInstanceOf[Map[Object,Object]])
}
def getParameterNames(): JEnum[Object] =
Please sign in to comment.
Something went wrong with that request. Please try again.