View | Details | Raw Unified | Return to bug 37736
Collapse All | Expand All

(-)src/java/org/apache/log4j/Category.java (-2 / +19 lines)
Lines 1210-1215 Link Here
1210
  		aai.removeAppender(appender);
1210
  		aai.removeAppender(appender);
1211
    }
1211
    }
1212
    lock.releaseWriteLock();
1212
    lock.releaseWriteLock();
1213
    
1214
    repository.fireRemoveAppenderEvent((Logger) this, appender);
1213
  }
1215
  }
1214
1216
1215
  /**
1217
  /**
Lines 1221-1234 Link Here
1221
   * @since 0.8.2
1223
   * @since 0.8.2
1222
   */
1224
   */
1223
  public void removeAppender(String name) {
1225
  public void removeAppender(String name) {
1226
    Appender  appender = null;
1227
    
1224
	  lock.getWriteLock();
1228
	  lock.getWriteLock();
1225
	  
1226
    if ((name == null) || (aai == null)) {
1229
    if ((name == null) || (aai == null)) {
1227
      // nothing to do
1230
      // nothing to do
1228
    } else {
1231
    } else {
1229
      aai.removeAppender(name);
1232
      appender = aai.getAppender( name );
1233
      aai.removeAppender( appender );
1230
    }
1234
    }
1231
    lock.releaseWriteLock();
1235
    lock.releaseWriteLock();
1236
    
1237
    if ( appender != null )
1238
      repository.fireRemoveAppenderEvent((Logger) this, appender);
1232
  }
1239
  }
1233
1240
1234
  /**
1241
  /**
Lines 1265-1271 Link Here
1265
   * </p>
1272
   * </p>
1266
   */
1273
   */
1267
  public void setLevel(Level level) {
1274
  public void setLevel(Level level) {
1275
    if ( level != null )
1276
    {
1277
      if ( level == this.level )
1278
        return;  // same level objects
1279
      if ( level.equals( this.level ) )
1280
        return;  // log level is not really changing
1281
    }
1282
    else if ( this.level == null )
1283
      return;  // both levels are null
1268
    this.level = level;
1284
    this.level = level;
1285
    repository.fireLevelChangedEvent( (Logger) this );
1269
  }
1286
  }
1270
1287
1271
//  /**
1288
//  /**

Return to bug 37736