Project

General

Profile

« Previous | Next » 

Revision 2638be38

Added by Andreas Müller over 8 years ago

migrate to hibernate 5 for cdmlib-services and cdmlib-ext #4716

  • (except for hibernate search tests)
  • including new spring-config structure

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/ConcurrentSessionTest.java
94 94
    @SpringBeanByType
95 95
    private ITaxonDao taxonDao;
96 96

  
97
    ConversationHolder conversationHolder1 = null;
98
    ConversationHolder conversationHolder2 = null;
99
    ConversationHolder conversationHolder3 = null;
97
    private ConversationHolder conversationHolder1 = null;
98
    private ConversationHolder conversationHolder2 = null;
99
    private ConversationHolder conversationHolder3 = null;
100 100

  
101
    DataSource targetDataSource;
101
    private DataSource targetDataSource;
102 102

  
103 103
    private final UUID taxonUuid1 = UUID.fromString("496b1325-be50-4b0a-9aa2-3ecd610215f2");
104 104
    private final UUID taxonUuid2 = UUID.fromString("822d98dc-9ef7-44b7-a870-94573a3bcb46");
......
111 111

  
112 112
    @Before
113 113
    public void setup(){
114
        targetDataSource = ((TransactionAwareDataSourceProxy)dataSource).getTargetDataSource();
114

  
115
        targetDataSource = dataSource instanceof TransactionAwareDataSourceProxy ?
116
                ((TransactionAwareDataSourceProxy)dataSource).getTargetDataSource():
117
                dataSource;
115 118
    }
116 119

  
117 120
    @After

Also available in: Unified diff