From 4177e6988530af4749f2ffdcd638da15541fe73e Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 30 十二月 2019 18:11:35 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/cEventCenter/ObjectPool.java | 12 ++++++++++--
app/src/main/AndroidManifest.xml | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d9e4c84..0c25bcf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- android:sharedUserId="android.uid.system"
+android:sharedUserId="android.uid.system"
package="safeluck.drive.evaluation">
<uses-permission android:name="android.permission.CAMERA" />
diff --git a/app/src/main/java/safeluck/drive/evaluation/cEventCenter/ObjectPool.java b/app/src/main/java/safeluck/drive/evaluation/cEventCenter/ObjectPool.java
index cd1478b..3eafce0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/cEventCenter/ObjectPool.java
+++ b/app/src/main/java/safeluck/drive/evaluation/cEventCenter/ObjectPool.java
@@ -49,7 +49,15 @@
* @return
*/
private T findFreeObject() {
-
- return null;
+ T obj = null;
+ synchronized (LOCK){
+ if (length > 0 ){
+ --length;
+ obj = mContainer[length];
+ //璧嬪�煎畬鎴愬悗閲婃斁璧勬簮
+ mContainer[length] = null;
+ }
+ }
+ return obj;
}
}
--
Gitblit v1.8.0