Project

General

Profile

« Previous | Next » 

Revision 19c8e760

Added by Leszek Koltunski about 1 year ago

Close assets after use.

View differences:

src/main/java/org/distorted/objectlib/main/InitAssets.java
9 9

  
10 10
package org.distorted.objectlib.main;
11 11

  
12
///////////////////////////////////////////////////////////////////////////////////////////////////
13

  
12
import java.io.IOException;
14 13
import java.io.InputStream;
15 14

  
15
///////////////////////////////////////////////////////////////////////////////////////////////////
16

  
16 17
public class InitAssets
17 18
  {
18 19
  InputStream mJsonStream;
19 20
  InputStream mMeshStream;
20 21

  
21
///////////////////////////////////////////////////////////////////////////////////////////////////
22

  
23
  public InitAssets(InputStream jsonStream)
24
    {
25
    mJsonStream = jsonStream;
26
    }
27

  
28 22
///////////////////////////////////////////////////////////////////////////////////////////////////
29 23

  
30 24
  public InitAssets(InputStream jsonStream, InputStream meshStream)
......
53 47
    {
54 48
    return mMeshStream;
55 49
    }
50

  
51
///////////////////////////////////////////////////////////////////////////////////////////////////
52

  
53
  public void close()
54
    {
55
    try
56
      {
57
      if( mJsonStream!=null ) mJsonStream.close();
58
      if( mMeshStream!=null ) mMeshStream.close();
59
      }
60
    catch(IOException ignored) {}
61
    }
56 62
}
src/main/java/org/distorted/objectlib/main/TwistyObject.java
171 171
      mSize      = reader.getSize();
172 172
      mInitData  = null;
173 173
      initialize(meshState,iconMode,quat,move,scale,meshStream,true);
174
      if( assets!=null ) assets.close();
174 175
      mError = false;
175 176
      mErrorString=null;
176 177
      }
......
190 191
    mInitData  = data;
191 192
    InputStream meshStream = assets!=null ? assets.getMeshStream() : null;
192 193
    initialize(meshState,iconMode,quat,move,scale,meshStream,false);
194
    if( assets!=null ) assets.close();
193 195
    mError = false;
194 196
    mErrorString = null;
195 197
    }

Also available in: Unified diff