From ddf7043ba43501433aad1599ec05368c6ce5ae7e Mon Sep 17 00:00:00 2001 From: Maxim Valyanskiy Date: Sat, 25 Apr 2015 08:47:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D1=80=D0=B0=D0=B7=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20=D0=B8=D1=81=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20findUserI?= =?UTF-8?q?dChecked?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/scala/ru/org/linux/user/UserService.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/ru/org/linux/user/UserService.scala b/src/main/scala/ru/org/linux/user/UserService.scala index 0e64a8e2b0..db54cd09c5 100644 --- a/src/main/scala/ru/org/linux/user/UserService.scala +++ b/src/main/scala/ru/org/linux/user/UserService.scala @@ -16,10 +16,10 @@ package ru.org.linux.user import java.io.{File, FileNotFoundException, IOException} import java.sql.Timestamp -import java.util.concurrent.ExecutionException import javax.annotation.Nullable import com.google.common.cache.{CacheBuilder, CacheLoader} +import com.google.common.util.concurrent.UncheckedExecutionException import com.typesafe.scalalogging.StrictLogging import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @@ -148,7 +148,7 @@ class UserService @Autowired() (siteConfig: SiteConfig, userDao: UserDao) extend try { nameToIdCache.get(nick) } catch { - case ex:ExecutionException ⇒ throw ex.getCause + case ex:UncheckedExecutionException ⇒ throw ex.getCause } }