improved watch service and JPAManager close connection