Project

General

Profile

Revision 2a0cf486

ID2a0cf486daa16b97349f612576ce00d53b3c3be1
Parent 42110f1d
Child e60198ab

Added by Andreas Kohlbecker over 2 years ago

ref #7219 solving problem in deproxy method

View differences:

cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/ProxyUtils.java
165 165
            LazyInitializer hli = ((HibernateProxy)o).getHibernateLazyInitializer();
166 166
            if(!hli.isUninitialized()) {
167 167
                return hli.getImplementation();
168

  
168
            } else {
169
                return null;
169 170
            }
170 171
        }
171 172

  
......
173 174
            PersistentCollection pc = ((PersistentCollection)o);
174 175
            if(pc.wasInitialized()) {
175 176
                return  ProxyUtils.getObject(pc);
176

  
177
            } else {
178
                return null;
177 179
            }
178 180
        }
179
        return null;
181
        return o;
180 182
    }
181 183

  
182 184
    public static boolean isUninitializedProxy(Object o) {

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)